Remove duplicate ExtensionContextMenuController.

Bug: 985382
Change-Id: I9bcc3f7429b0c2a2e697f6e2cfae5888448249c2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1775102
Commit-Queue: Charlene Yan <cyan@chromium.org>
Reviewed-by: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#691409}

chrome/browser/ui/views/extensions/extensions_menu_button.cc

@@ -51,11 +51,9 @@ ExtensionsMenuButton::ExtensionsMenuButton(
                   true,
                   true),
       browser_(browser),
+      parent_(parent),
       controller_(controller),
-      model_(ToolbarActionsModel::Get(browser_->profile())),
-      context_menu_controller_(nullptr, controller_) {
-  set_context_menu_controller(&context_menu_controller_);
-
+      model_(ToolbarActionsModel::Get(browser_->profile())) {
   // Set so the extension button receives enter/exit on children to retain hover
   // status when hovering child views.
   set_notify_enter_exit_on_child(true);
@@ -150,7 +148,7 @@ void ExtensionsMenuButton::UpdateState() {
 }
 
 bool ExtensionsMenuButton::IsMenuRunning() const {
-  return context_menu_controller_.IsMenuRunning();
+  return parent_->IsContextMenuRunning();
 }
 
 void ExtensionsMenuButton::ConfigureSecondaryView() {
@@ -170,7 +168,6 @@ void ExtensionsMenuButton::ConfigureSecondaryView() {
 
   pin_button_ = pin_button.get();
   SetSecondaryButtonHighlightPath(pin_button_);
-  UpdatePinButton();
   container->AddChildView(std::move(pin_button));
 }
 

chrome/browser/ui/views/extensions/extensions_menu_button.h

@@ -61,6 +61,9 @@ class ExtensionsMenuButton : public HoverButton,
 
   Browser* const browser_;
 
+  // The container containing this view.
+  ExtensionsMenuItemView* const parent_;
+
   // Responsible for executing the extension's actions.
   ToolbarActionViewController* const controller_;
 
@@ -68,10 +71,6 @@ class ExtensionsMenuButton : public HoverButton,
 
   views::ImageButton* pin_button_ = nullptr;
 
-  // This controller is responsible for showing the context menu for an
-  // extension.
-  ExtensionContextMenuController context_menu_controller_;
-
   DISALLOW_COPY_AND_ASSIGN(ExtensionsMenuButton);
 };
 

chrome/browser/ui/views/extensions/extensions_menu_item_view.cc

@@ -73,6 +73,8 @@ ExtensionsMenuItemView::ExtensionsMenuItemView(
 
   context_menu_button_ = context_menu_button.get();
   AddChildView(std::move(context_menu_button));
+
+  UpdatePinButton();
 }
 
 ExtensionsMenuItemView::~ExtensionsMenuItemView() = default;
@@ -91,6 +93,10 @@ void ExtensionsMenuItemView::UpdatePinButton() {
   primary_action_button_->UpdatePinButton();
 }
 
+bool ExtensionsMenuItemView::IsContextMenuRunning() {
+  return context_menu_controller_->IsMenuRunning();
+}
+
 ExtensionsMenuButton*
 ExtensionsMenuItemView::primary_action_button_for_testing() {
   return primary_action_button_;

chrome/browser/ui/views/extensions/extensions_menu_item_view.h

@@ -41,6 +41,8 @@ class ExtensionsMenuItemView : public views::View,
 
   void UpdatePinButton();
 
+  bool IsContextMenuRunning();
+
   ExtensionsMenuButton* primary_action_button_for_testing();
 
  private:
@@ -50,6 +52,8 @@ class ExtensionsMenuItemView : public views::View,
 
   views::MenuButton* context_menu_button_ = nullptr;
 
+  // This controller is responsible for showing the context menu for an
+  // extension.
   std::unique_ptr<ExtensionContextMenuController> context_menu_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionsMenuItemView);