[Screen Selection]

jefry-vcube · jefry-vcube · commit caedb6a2bec6 · 2015-05-21T16:57:16.000+08:00
add application name to the UI,
cancelChooseDesktopMedia implementation
diff --git a/src/api/screen/desktop_capture_api.cc b/src/api/screen/desktop_capture_api.cc
@@ -12,6 +12,8 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/nw/src/nw_package.h"
+#include "content/nw/src/nw_shell.h"
 #include "net/base/net_util.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
@@ -68,7 +70,8 @@ bool DesktopCaptureChooseDesktopMediaFunction::RunSync() {
   // also be used to determine where to show the picker's UI.
   content::WebContents* web_contents = content::WebContents::FromRenderViewHost(render_view_host());
   DCHECK(web_contents);
-  base::string16 target_name;
+  content::Shell* shell = content::Shell::windows()[0];
+  base::string16 app_name = base::UTF8ToUTF16(shell->GetPackage()->GetName());
 
   // Register to be notified when the tab is closed.
   Observe(web_contents);
@@ -136,8 +139,8 @@ bool DesktopCaptureChooseDesktopMediaFunction::RunSync() {
   picker_->Show(web_contents,
                 parent_window,
                 parent_window,
-                target_name,
-                target_name,
+                app_name,
+                app_name,
                 media_list.Pass(),
                 callback);
   return true;
diff --git a/src/api/screen/screen.cc b/src/api/screen/screen.cc
@@ -164,6 +164,14 @@ void Screen::Call(DispatcherHost* dispatcher_host,
       // Screen Picker GUI is still active, return false;
       result->AppendBoolean(false);
     }
+  } else if (method == "CancelChooseDesktopMedia") {
+    if (gpDCCDMF) {
+      gpDCCDMF->Cancel();
+      gpDCCDMF = NULL;
+      result->AppendBoolean(true);
+    } else {
+      result->AppendBoolean(false);
+    }
   }
 
 }
diff --git a/src/api/screen/screen.js b/src/api/screen/screen.js
@@ -74,6 +74,9 @@ Screen.prototype.chooseDesktopMedia = function(array, callback) {
   return false;
 }
 
+Screen.prototype.cancelChooseDesktopMedia = function() {
+  return nw.callStaticMethodSync('Screen', 'CancelChooseDesktopMedia', [ this.id ])[0];
+}
 // ======== Screen functions End ========
 
 // Store App object in node's context.

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,14 @@ void Screen::Call(DispatcherHost* dispatcher_host,`
`164`	`164`	`// Screen Picker GUI is still active, return false;`
`165`	`165`	`result->AppendBoolean(false);`
`166`	`166`	`}`
	`167`	`+ } else if (method == "CancelChooseDesktopMedia") {`
	`168`	`+ if (gpDCCDMF) {`
	`169`	`+ gpDCCDMF->Cancel();`
	`170`	`+ gpDCCDMF = NULL;`
	`171`	`+ result->AppendBoolean(true);`
	`172`	`+ } else {`
	`173`	`+ result->AppendBoolean(false);`
	`174`	`+ }`
`167`	`175`	`}`
`168`	`176`
`169`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,9 @@ Screen.prototype.chooseDesktopMedia = function(array, callback) {`
`74`	`74`	`return false;`
`75`	`75`	`}`
`76`	`76`
	`77`	`+Screen.prototype.cancelChooseDesktopMedia = function() {`
	`78`	`+ return nw.callStaticMethodSync('Screen', 'CancelChooseDesktopMedia', [ this.id ])[0];`
	`79`	`+}`
`77`	`80`	`// ======== Screen functions End ========`
`78`	`81`
`79`	`82`	`// Store App object in node's context.`