Add infrastructure for Chrome Actions

chrome/browser/ui/views/toolbar/chevron_menu_button.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/toolbar/chevron_menu_button.h"
 
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_action.h"
+#include "chrome/browser/extensions/extension_action_icon_factory.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
+#include "chrome/browser/ui/views/extensions/extension_action_view_controller.h"
 #include "chrome/browser/ui/views/toolbar/browser_action_view.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/menu/menu_delegate.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/metrics.h"
 
 namespace {
 
 // In the browser actions container's chevron menu, a menu item view's icon
 // comes from BrowserActionView::GetIconWithBadge() when the menu item view is
 // created. But, the browser action's icon may not be loaded in time because it
 // is read from file system in another thread.
 // The IconUpdater will update the menu item view's icon when the browser
 // action's icon has been updated.
-class IconUpdater : public BrowserActionView::IconObserver {
+class IconUpdater : public ExtensionActionIconFactory::Observer {
  public:
-  IconUpdater(views::MenuItemView* menu_item_view, BrowserActionView* view)
+  IconUpdater(views::MenuItemView* menu_item_view,
+              ExtensionActionViewController* view_controller)
       : menu_item_view_(menu_item_view),
-        view_(view) {
+        view_controller_(view_controller) {
     DCHECK(menu_item_view);
-    DCHECK(view);
-    view->set_icon_observer(this);
+    DCHECK(view_controller);
+    view_controller->set_icon_observer(this);
   }
   virtual ~IconUpdater() {
-    view_->set_icon_observer(NULL);
+    view_controller_->set_icon_observer(NULL);
   }
 
   // BrowserActionView::IconObserver:
-  virtual void OnIconUpdated(const gfx::ImageSkia& icon) override {
-    menu_item_view_->SetIcon(icon);
+  virtual void OnIconUpdated() override {
+    menu_item_view_->SetIcon(view_controller_->GetIconWithBadge());
   }
 
  private:
   // The menu item view whose icon might be updated.
   views::MenuItemView* menu_item_view_;
 
-  // The view to be observed. When its icon changes, update the corresponding
-  // menu item view's icon.
-  BrowserActionView* view_;
+  // The view controller to be observed. When its icon changes, update the
+  // corresponding menu item view's icon.
+  ExtensionActionViewController* view_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(IconUpdater);
 };
 
 }  // namespace
 
 // This class handles the overflow menu for browser actions.
 class ChevronMenuButton::MenuController : public views::MenuDelegate {
  public:
   MenuController(ChevronMenuButton* owner,
@@ skipping 81 matching lines @@
   menu_ = new views::MenuItemView(this);
   menu_runner_.reset(new views::MenuRunner(
       menu_, for_drop_ ? views::MenuRunner::FOR_DROP : 0));
   menu_->set_has_icons(true);
 
   size_t command_id = 1;  // Menu id 0 is reserved, start with 1.
   for (size_t i = start_index_;
        i < browser_actions_container_->num_browser_actions(); ++i) {
     BrowserActionView* view =
         browser_actions_container_->GetBrowserActionViewAt(i);
+    ExtensionActionViewController* view_controller =
+        view->GetExtensionActionViewController();
     views::MenuItemView* menu_item = menu_->AppendMenuItemWithIcon(
         command_id,
-        base::UTF8ToUTF16(view->extension()->name()),
-        view->GetIconWithBadge());
+        base::UTF8ToUTF16(view_controller->extension()->name()),
+        view_controller->GetIconWithBadge());
 
     // Set the tooltip for this item.
-    base::string16 tooltip = base::UTF8ToUTF16(
-        view->extension_action()->GetTitle(
-            view->view_controller()->GetCurrentTabId()));
-    menu_->SetTooltip(tooltip, command_id);
+    menu_->SetTooltip(
+        view_controller->GetTooltip(view->GetCurrentWebContents()),
+        command_id);
 
-    icon_updaters_.push_back(new IconUpdater(menu_item, view));
+    icon_updaters_.push_back(
+        new IconUpdater(menu_item, view->GetExtensionActionViewController()));

[Finnur, 2014/10/17 09:57:02]

nit: s/view->GetExtensionActionViewController()/view_controller/ ?

[Devlin, 2014/10/17 16:33:33]

Done.

 
     ++command_id;
   }
 }
 
 ChevronMenuButton::MenuController::~MenuController() {
 }
 
 void ChevronMenuButton::MenuController::RunMenu(views::Widget* window) {
   gfx::Rect bounds = owner_->bounds();
@@ skipping 20 matching lines @@
   }
 }
 
 void ChevronMenuButton::MenuController::CloseMenu() {
   menu_->Cancel();
 }
 
 bool ChevronMenuButton::MenuController::IsCommandEnabled(int id) const {
   BrowserActionView* view =
       browser_actions_container_->GetBrowserActionViewAt(start_index_ + id - 1);
-  return view->IsEnabled(view->view_controller()->GetCurrentTabId());
+  return view->view_controller()->IsEnabled(view->GetCurrentWebContents());
 }
 
 void ChevronMenuButton::MenuController::ExecuteCommand(int id) {
   browser_actions_container_->GetBrowserActionViewAt(start_index_ + id - 1)->
       view_controller()->ExecuteActionByUser();
 }
 
 bool ChevronMenuButton::MenuController::ShowContextMenu(
     views::MenuItemView* source,
     int id,
     const gfx::Point& p,
     ui::MenuSourceType source_type) {
   BrowserActionView* view = browser_actions_container_->GetBrowserActionViewAt(
       start_index_ + id - 1);
-  if (!view->extension()->ShowConfigureContextMenus())
+  ExtensionActionViewController* view_controller =
+      view->GetExtensionActionViewController();
+  if (!view_controller->extension()->ShowConfigureContextMenus())
     return false;
 
   scoped_refptr<ExtensionContextMenuModel> context_menu_contents =
-      new ExtensionContextMenuModel(view->extension(),
-                                    view->view_controller()->browser(),
-                                    view->view_controller());
+      new ExtensionContextMenuModel(view_controller->extension(),
+                                    view->browser(),
+                                    view_controller);
   views::MenuRunner context_menu_runner(context_menu_contents.get(),
                                         views::MenuRunner::HAS_MNEMONICS |
                                             views::MenuRunner::IS_NESTED |
                                             views::MenuRunner::CONTEXT_MENU);
 
   // We can ignore the result as we delete ourself.
   // This blocks until the user chooses something or dismisses the menu.
   if (context_menu_runner.RunMenuAt(owner_->GetWidget(),
                                     NULL,
                                     gfx::Rect(p, gfx::Size()),
@@ skipping 88 matching lines @@
 }
 
 bool ChevronMenuButton::MenuController::CanDrag(views::MenuItemView* menu) {
   return true;
 }
 
 void ChevronMenuButton::MenuController::WriteDragData(
     views::MenuItemView* sender, OSExchangeData* data) {
   size_t drag_index = IndexForId(sender->GetCommand());
   const extensions::Extension* extension =
-      browser_actions_container_->GetBrowserActionViewAt(drag_index)->
-          extension();
+      browser_actions_container_->GetExtensionAt(drag_index);
   BrowserActionDragData drag_data(extension->id(), drag_index);
   drag_data.Write(browser_actions_container_->profile(), data);
 }
 
 int ChevronMenuButton::MenuController::GetDragOperations(
     views::MenuItemView* sender) {
   return ui::DragDropTypes::DRAG_MOVE;
 }
 
 size_t ChevronMenuButton::MenuController::IndexForId(int id) const {
@@ skipping 75 matching lines @@
 void ChevronMenuButton::ShowOverflowMenu(bool for_drop) {
   DCHECK(!menu_controller_);
   menu_controller_.reset(new MenuController(
       this, browser_actions_container_, for_drop));
   menu_controller_->RunMenu(GetWidget());
 }
 
 void ChevronMenuButton::MenuDone() {
   menu_controller_.reset();
 }