Linux Menu fix

rogerwang · rogerwang · commit c6dbac830eb9 · 2015-07-15T15:35:24.000+08:00
diff --git a/nw.gypi b/nw.gypi
@@ -675,6 +675,12 @@
         'src/api/menuitem/menuitem_views.cc',
         'src/api/shell/shell.cc',
         'src/api/shell/shell.h',
+        'src/browser/browser_view_layout.cc',
+        'src/browser/browser_view_layout.h',
+        'src/browser/menubar_controller.cc',
+        'src/browser/menubar_controller.h',
+        'src/browser/menubar_view.cc',
+        'src/browser/menubar_view.h',
         'src/nw_content.cc',
         'src/nw_content.h',
         'src/nw_custom_bindings.cc',
diff --git a/src/api/base/base.cc b/src/api/base/base.cc
@@ -29,8 +29,8 @@ Base::Base(int id,
            const base::WeakPtr<ObjectManager>& object_manager,
            const base::DictionaryValue& option,
 	   const std::string& extension_id)
-    : id_(id),
-      extension_id_(extension_id),
+    : extension_id_(extension_id),
+      id_(id),
       object_manager_(object_manager) {
 }
 
diff --git a/src/api/menu/menu.h b/src/api/menu/menu.h
@@ -118,15 +118,13 @@ class Menu : public Base {
 #endif
 
 #if defined(OS_MACOSX)
-  friend class nw::NativeWindowCocoa;
   NSMenu* menu_;
   NWMenuDelegate* menu_delegate_;
 #elif defined(OS_LINUX)
-  friend class nw::NativeWindowAura;
 
   views::FocusManager *focus_manager_;
   std::vector<MenuItem*> menu_items_;
-  nw::NativeWindowAura* window_;
+  extensions::AppWindow* window_;
   // Flag to indicate the menu has been modified since last show, so we should
   // rebuild the menu before next show.
   bool is_menu_modified_;
diff --git a/src/api/nw_shell.idl b/src/api/nw_shell.idl
@@ -1,9 +1,9 @@
-// nw Shell API
-[implemented_in="content/nw/src/api/nw_shell_api.h"]
-namespace nw.Shell {
-  interface Functions {
-    [nocompile] static void openExternal(DOMString uri);
-    [nocompile] static void openItem(DOMString filePath);
-    [nocompile] static void showItemInFolder(DOMString filePath);
-  };
-};
+// nw Shell API
+[implemented_in="content/nw/src/api/nw_shell_api.h"]
+namespace nw.Shell {
+  interface Functions {
+    [nocompile] static void openExternal(DOMString uri);
+    [nocompile] static void openItem(DOMString filePath);
+    [nocompile] static void showItemInFolder(DOMString filePath);
+  };
+};
diff --git a/src/api/nw_window_api.cc b/src/api/nw_window_api.cc
@@ -24,11 +24,18 @@
 #include "ui/views/win/hwnd_util.h"
 #endif
 
+#if defined(OS_LINUX)
+#include "content/nw/src/browser/menubar_view.h"
+#include "content/nw/src/browser/browser_view_layout.h"
+using nw::BrowserViewLayout;
+#endif
+
 using content::RenderWidgetHost;
 using content::RenderWidgetHostView;
 using content::WebContents;
 
 using nw::Menu;
+using nw::MenuBarView;
 
 namespace extensions {
 namespace {
@@ -228,12 +235,16 @@ bool NwCurrentWindowInternalSetMenuFunction::RunAsync() {
 
   window->menu_ = menu;
 #if defined(OS_LINUX)
+  native_app_window::NativeAppWindowViews* native_app_window_views =
+      static_cast<native_app_window::NativeAppWindowViews*>(
+          window->GetBaseWindow());
+
   MenuBarView* menubar = new MenuBarView();
-  GetBrowserViewLayout()->set_menu_bar(menubar);
-  AddChildView(menubar);
+  static_cast<BrowserViewLayout*>(native_app_window_views->GetLayoutManager())->set_menu_bar(menubar);
+  native_app_window_views->AddChildView(menubar);
   menubar->UpdateMenu(menu->model());
-  Layout();
-  SchedulePaint();
+  native_app_window_views->layout_();
+  native_app_window_views->SchedulePaint();
 #endif
   // The menu is lazily built.
 #if defined(OS_WIN) //FIXME
diff --git a/src/nw_content.cc b/src/nw_content.cc
@@ -663,7 +663,9 @@ bool ExecuteAppCommandHook(int command_id, extensions::AppWindow* app_window) {
   if (!menu)
     return false;
   menu->menu_delegate_->ExecuteCommand(command_id, 0);
+#if defined(OS_WIN)
   menu->menu_->UpdateStates();
+#endif
   return true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -663,7 +663,9 @@ bool ExecuteAppCommandHook(int command_id, extensions::AppWindow* app_window) {`
`663`	`663`	`if (!menu)`
`664`	`664`	`return false;`
`665`	`665`	`menu->menu_delegate_->ExecuteCommand(command_id, 0);`
	`666`	`+#if defined(OS_WIN)`
`666`	`667`	`menu->menu_->UpdateStates();`
	`668`	`+#endif`
`667`	`669`	`return true;`
`668`	`670`	`}`
`669`	`671`