make menu show event sync

rogerwang · rogerwang · commit 20fbe5fc3e41 · 2015-01-01T20:58:34.000+08:00
Conflicts:
	src/api/dispatcher_host.cc
diff --git a/src/api/app/app.cc b/src/api/app/app.cc
@@ -121,7 +121,8 @@ void App::Call(const std::string& method,
 void App::Call(Shell* shell,
                const std::string& method,
                const base::ListValue& arguments,
-               base::ListValue* result) {
+               base::ListValue* result,
+               DispatcherHost* dispatcher_host) {
   if (method == "GetDataPath") {
     ShellBrowserContext* browser_context =
       static_cast<ShellBrowserContext*>(shell->web_contents()->GetBrowserContext());
@@ -204,6 +205,9 @@ void App::Call(Shell* shell,
     arguments.GetString(0, &proxy_config);
     SetProxyConfig(GetRenderProcessHost(), proxy_config);
     return;
+  } else if (method == "DoneMenuShow") {
+    dispatcher_host->quit_run_loop();
+    return;
   }
 
   NOTREACHED() << "Calling unknown sync method " << method << " of App";
diff --git a/src/api/app/app.h b/src/api/app/app.h
@@ -22,6 +22,7 @@
 #define CONTENT_NW_SRC_API_APP_APP_H_
 
 #include "base/basictypes.h"
+#include "../dispatcher_host.h"
 
 #include <string>
 
@@ -44,7 +45,8 @@ class App {
   static void Call(content::Shell* shell,
                    const std::string& method,
                    const base::ListValue& arguments,
-                   base::ListValue* result);
+                   base::ListValue* result,
+                   DispatcherHost* dispatcher_host);
 
   // Try to close all windows (then will cause whole app to quit).
   static void CloseAllWindows(bool force = false, bool quit = false);
diff --git a/src/api/app/app.js b/src/api/app/app.js
@@ -61,6 +61,10 @@ App.prototype.clearCache = function() {
   nw.callStaticMethodSync('App', 'ClearCache', [ ]);
 }
 
+App.prototype.doneMenuShow = function() {
+  nw.callStaticMethodSync('App', 'DoneMenuShow', [ ]);
+}
+
 App.prototype.getProxyForURL = function (url) {
   return nw.callStaticMethodSync('App', 'getProxyForURL', [ url ]);
 }
diff --git a/src/api/dispatcher_host.cc b/src/api/dispatcher_host.cc
@@ -21,6 +21,7 @@
 #include "content/nw/src/api/dispatcher_host.h"
 
 #include "base/logging.h"
+#include "base/run_loop.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
 #include "content/browser/child_process_security_policy_impl.h"
@@ -56,7 +57,8 @@ static std::map<content::RenderViewHost*, DispatcherHost*> g_dispatcher_host_map
 DispatcherHost::DispatcherHost(content::RenderViewHost* host)
   : content::WebContentsObserver(content::WebContents::FromRenderViewHost(host)),
     render_view_host_(host),
-    weak_ptr_factory_(this) {
+    weak_ptr_factory_(this),
+    run_loop_(NULL) {
   g_dispatcher_host_map[render_view_host_] = this;
 }
 
@@ -103,11 +105,17 @@ bool DispatcherHost::Send(IPC::Message* message) {
   return render_view_host_->Send(message);
 }
 
+void DispatcherHost::quit_run_loop() {
+  if (run_loop_)
+    run_loop_->Quit();
+}
+
 bool DispatcherHost::OnMessageReceived(
                                        content::RenderViewHost* render_view_host,
                                        const IPC::Message& message) {
   if (render_view_host != render_view_host_)
     return false;
+
   bool handled = true;
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   base::ThreadRestrictions::ScopedAllowWait allow_wait;
@@ -250,7 +258,7 @@ void DispatcherHost::OnCallStaticMethodSync(
   if (type == "App") {
     content::Shell* shell =
         content::Shell::FromRenderViewHost(render_view_host());
-    nwapi::App::Call(shell, method, arguments, result);
+    nwapi::App::Call(shell, method, arguments, result, this);
     return;
   } else if (type == "Screen") {
     nwapi::Screen::Call(this, method, arguments, result);
diff --git a/src/api/dispatcher_host.h b/src/api/dispatcher_host.h
@@ -32,6 +32,7 @@
 namespace base {
 class DictionaryValue;
 class ListValue;
+class RunLoop;
 }
 
 namespace WebKit {
@@ -76,6 +77,8 @@ class DispatcherHost : public content::WebContentsObserver {
     return render_view_host_;
   }
 
+  void set_run_loop(base::RunLoop* run_loop) { run_loop_ = run_loop; }
+  void quit_run_loop();
  private:
   content::RenderViewHost* render_view_host_;
   friend class content::Shell;
@@ -88,6 +91,8 @@ class DispatcherHost : public content::WebContentsObserver {
   // Factory to generate weak pointer
   base::WeakPtrFactory<DispatcherHost> weak_ptr_factory_;
 
+  base::RunLoop* run_loop_;
+
   // RenderViewHostObserver implementation.
   // WebContentsObserver implementation:
   virtual bool OnMessageReceived(
diff --git a/src/api/menu/menu_delegate_mac.mm b/src/api/menu/menu_delegate_mac.mm
@@ -18,6 +18,7 @@
 // ETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 //  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#include "base/run_loop.h"
 #include "content/nw/src/api/dispatcher_host.h"
 #include "content/nw/src/api/menu/menu.h"
 #include "content/nw/src/api/menu/menu_delegate_mac.h"
@@ -35,7 +36,10 @@ - (id)initWithMenu:(nwapi::Menu*) menu {
 
 - (void)menuNeedsUpdate:(NSMenu*)menu {
   base::ListValue args;
+  base::RunLoop run_loop;
+  nwmenu_->dispatcher_host()->set_run_loop(&run_loop);
   nwmenu_->dispatcher_host()->SendEvent(nwmenu_, "show", args);
+  run_loop.Run();
 }
 
 @end

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,10 @@ App.prototype.clearCache = function() {`
`61`	`61`	`nw.callStaticMethodSync('App', 'ClearCache', [ ]);`
`62`	`62`	`}`
`63`	`63`
	`64`	`+App.prototype.doneMenuShow = function() {`
	`65`	`+ nw.callStaticMethodSync('App', 'DoneMenuShow', [ ]);`
	`66`	`+}`
	`67`	`+`
`64`	`68`	`App.prototype.getProxyForURL = function (url) {`
`65`	`69`	`return nw.callStaticMethodSync('App', 'getProxyForURL', [ url ]);`
`66`	`70`	`}`