Fix nwjs#2595: Linux MenuBar crash

Author: rogerwang

src/browser/menubar_controller.cc

@@ -1,17 +1,31 @@
 #include "content/nw/src/browser/menubar_controller.h"
 
+#include "base/stl_util.h"
 #include "content/nw/src/browser/menubar_view.h"
+#include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/menu/menu_item_view.h"
+#include "ui/views/widget/widget.h"
 
 namespace nw {
 
 MenuBarController::ModelToMenuMap MenuBarController::model_to_menu_map_;
+MenuBarController* MenuBarController::master_;
 
-MenuBarController::MenuBarController(MenuBarView* menubar, ui::MenuModel* menu_model)
+MenuBarController::MenuBarController(MenuBarView* menubar, ui::MenuModel* menu_model, MenuBarController* master)
   :MenuModelAdapter(menu_model), menubar_(menubar) {
+
+  views::MenuItemView* menu = MenuBarController::CreateMenu(menubar, menu_model, this);
+  if (!master) {
+    master_ = this;
+    menu_runner_.reset(new views::MenuRunner(menu, views::MenuRunner::HAS_MNEMONICS));
+  }
 }
 
 MenuBarController::~MenuBarController() {
+  if (master_ == this) {
+    STLDeleteElements(&controllers_);
+    model_to_menu_map_.clear();
+  }
 }
 
 views::MenuItemView* MenuBarController::GetSiblingMenu(
@@ -30,19 +44,33 @@ views::MenuItemView* MenuBarController::GetSiblingMenu(
 
   *has_mnemonics = false;
   *anchor = views::MENU_ANCHOR_TOPLEFT;
-  if (!model_to_menu_map_[model])
-    CreateMenu(menubar_, model);
+  if (!model_to_menu_map_[model]) {
+    MenuBarController* controller = new MenuBarController(menubar_, model, master_);
+    CreateMenu(menubar_, model, controller);
+    controllers_.push_back(controller);
+  }
 
   return model_to_menu_map_[model];
 }
 
-views::MenuItemView* MenuBarController::CreateMenu(MenuBarView* menubar, ui::MenuModel* model) {
-  MenuBarController* controller = new MenuBarController(menubar, model);
+views::MenuItemView* MenuBarController::CreateMenu(MenuBarView* menubar,
+                                                   ui::MenuModel* model,
+                                                   MenuBarController* controller) {
   views::MenuItemView* menu = new views::MenuItemView(controller);
   controller->BuildMenu(menu);
   model_to_menu_map_[model] = menu;
 
   return menu;
 }
 
+void MenuBarController::RunMenuAt(views::View* view, const gfx::Point& point) {
+
+  ignore_result(menu_runner_->RunMenuAt(view->GetWidget()->GetTopLevelWidget(),
+                              static_cast<views::MenuButton*>(view),
+                              gfx::Rect(point, gfx::Size()),
+                              views::MENU_ANCHOR_TOPRIGHT,
+                                        ui::MENU_SOURCE_NONE));
+  delete this;
+}
+
 } //namespace nw

src/browser/menubar_controller.h

@@ -2,6 +2,8 @@
 #define NW_BROWSER_MENUBAR_CONTROLLER_H
 
 #include "ui/views/controls/menu/menu_model_adapter.h"
+#include "ui/views/controls/menu/menu_runner.h"
+#include "ui/views/view.h"
 
 #include <map>
 
@@ -14,10 +16,11 @@ class MenuBarView;
 
 class MenuBarController : public views::MenuModelAdapter {
  public:
-  MenuBarController(MenuBarView* menubar, ui::MenuModel* menu_model);
+  MenuBarController(MenuBarView* menubar, ui::MenuModel* menu_model, MenuBarController* master);
   virtual ~MenuBarController();
 
-  static views::MenuItemView* CreateMenu(MenuBarView* menubar, ui::MenuModel* model);
+  static views::MenuItemView* CreateMenu(MenuBarView* menubar, ui::MenuModel* model, MenuBarController* controller);
+  void RunMenuAt(views::View* view, const gfx::Point& point);
 
   virtual views::MenuItemView* GetSiblingMenu(
       views::MenuItemView* menu,
@@ -30,7 +33,10 @@ class MenuBarController : public views::MenuModelAdapter {
   typedef std::map<const ui::MenuModel*, views::MenuItemView*> ModelToMenuMap;
 
   MenuBarView* menubar_;
+  scoped_ptr<views::MenuRunner> menu_runner_;
+  std::vector<MenuBarController*> controllers_;
   static ModelToMenuMap model_to_menu_map_;
+  static MenuBarController* master_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuBarController);
 };

src/browser/menubar_view.cc

@@ -10,7 +10,6 @@
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/views/controls/button/menu_button.h"
-#include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
@@ -112,20 +111,8 @@ void MenuBarView::OnMenuButtonClicked(views::View* view,
   DCHECK_NE(-1, button_index);
   ui::MenuModel::ItemType type = model_->GetTypeAt(button_index);
   if (type == ui::MenuModel::TYPE_SUBMENU) {
-    views::MenuItemView* menu = MenuBarController::CreateMenu(this, model_->GetSubmenuModelAt(button_index));
-    menu_runner_.reset(new MenuRunner(menu, MenuRunner::HAS_MNEMONICS));
-
-    // menu_runner_.reset(new MenuRunner(model_->GetSubmenuModelAt(button_index),
-    //                                   MenuRunner::HAS_MNEMONICS));
-
-    if (menu_runner_->RunMenuAt(GetWidget()->GetTopLevelWidget(),
-                                static_cast<views::MenuButton*>(view),
-                                gfx::Rect(point, gfx::Size()),
-                                views::MENU_ANCHOR_TOPRIGHT,
-                                ui::MENU_SOURCE_NONE) ==
-      MenuRunner::MENU_DELETED) {
-      return;
-    }
+    MenuBarController* controller = new MenuBarController(this, model_->GetSubmenuModelAt(button_index), NULL);
+    controller->RunMenuAt(view, point);
   }
 }
 

src/browser/menubar_view.h

@@ -59,7 +59,6 @@ class MenuBarView :
 
  private:
   ui::MenuModel* model_;
-  scoped_ptr<views::MenuRunner> menu_runner_;
   DISALLOW_COPY_AND_ASSIGN(MenuBarView);
 };
 } //namespace nw