[Extensions UI] Clean up extension icon generation

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/location.h"
 #include "base/memory/scoped_vector.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 20 matching lines @@
 
 // In the browser actions container's chevron menu, a menu item view's icon
 // comes from ToolbarActionView::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 ExtensionActionIconFactory::Observer {
  public:
   IconUpdater(views::MenuItemView* menu_item_view,
-              ExtensionActionViewController* view_controller)
+              ToolbarActionView* represented_view)
       : menu_item_view_(menu_item_view),
-        view_controller_(view_controller) {
+        represented_view_(represented_view) {
     DCHECK(menu_item_view);
-    DCHECK(view_controller);
-    view_controller->set_icon_observer(this);
+    DCHECK(represented_view);
+    view_controller()->set_icon_observer(this);
   }
-  ~IconUpdater() override { view_controller_->set_icon_observer(nullptr); }
+  ~IconUpdater() override { view_controller()->set_icon_observer(nullptr); }
 
   // ExtensionActionIconFactory::Observer:
   void OnIconUpdated() override {
-    menu_item_view_->SetIcon(view_controller_->GetIconWithBadge());
+    menu_item_view_->SetIcon(
+        represented_view_->GetImage(views::Button::STATE_NORMAL));
   }
 
  private:
+  ExtensionActionViewController* view_controller() {
+    // Since the chevron overflow menu is only used in a world where toolbar
+    // actions are only extensions, this cast is safe.
+    return static_cast<ExtensionActionViewController*>(
+        represented_view_->view_controller());
+  }
+
   // The menu item view whose icon might be updated.
   views::MenuItemView* menu_item_view_;
 
-  // The view controller to be observed. When its icon changes, update the
-  // corresponding menu item view's icon.
-  ExtensionActionViewController* view_controller_;
+  // The view this icon updater is helping represent in the chevron overflow
+  // menu. When its icon changes, this updates the corresponding menu item
+  // view's icon.
+  ToolbarActionView* represented_view_;
 
   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 84 matching lines @@
   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_toolbar_actions(); ++i) {
     ToolbarActionView* view =
         browser_actions_container_->GetToolbarActionViewAt(i);
     views::MenuItemView* menu_item = menu_->AppendMenuItemWithIcon(
         command_id,
         view->view_controller()->GetActionName(),
-        view->view_controller()->GetIconWithBadge());
+        view->GetImage(views::Button::STATE_NORMAL));
 
     // Set the tooltip for this item.
     menu_->SetTooltip(
         view->view_controller()->GetTooltip(view->GetCurrentWebContents()),
         command_id);
 
-    icon_updaters_.push_back(new IconUpdater(
-        menu_item,
-        static_cast<ExtensionActionViewController*>(view->view_controller())));
+    icon_updaters_.push_back(new IconUpdater(menu_item, view));
 
     ++command_id;
   }
 }
 
 ChevronMenuButton::MenuController::~MenuController() {
 }
 
 void ChevronMenuButton::MenuController::RunMenu(views::Widget* window) {
   gfx::Rect bounds = owner_->bounds();
@@ skipping 246 matching lines @@
   // We should never try to show an overflow menu when one is already visible.
   DCHECK(!menu_controller_);
   menu_controller_.reset(new MenuController(
       this, browser_actions_container_, for_drop));
   menu_controller_->RunMenu(GetWidget());
 }
 
 void ChevronMenuButton::MenuDone() {
   menu_controller_.reset();
 }