Make a platform-independent ToolbarActionViewController

chrome/browser/ui/views/location_bar/page_action_image_view.cc

 // Copyright (c) 2012 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/location_bar/page_action_image_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "extensions/browser/extension_registry.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 
 // static
 const char PageActionImageView::kViewClassName[] = "PageActionImageView";
 
 PageActionImageView::PageActionImageView(LocationBarView* owner,
                                          ExtensionAction* page_action,
                                          Browser* browser)
-    : view_controller_(new ExtensionActionViewController(
+    : view_controller_(new ExtensionActionViewControllerViews(
           extensions::ExtensionRegistry::Get(browser->profile())->
               enabled_extensions().GetByID(page_action->extension_id()),
           browser,
           page_action)),
       owner_(owner),
       preview_enabled_(false) {
   // There should be an associated focus manager so that we can safely register
   // accelerators for commands.
   DCHECK(GetFocusManagerForAccelerator());
   SetAccessibilityFocusable(true);
@@ skipping 73 matching lines @@
 void PageActionImageView::PaintChildren(gfx::Canvas* canvas,
                                         const views::CullSet& cull_set) {
   View::PaintChildren(canvas, cull_set);
   int tab_id = SessionTabHelper::IdForTab(GetCurrentWebContents());
   if (tab_id >= 0) {
     view_controller_->extension_action()->PaintBadge(
         canvas, GetLocalBounds(), tab_id);
   }
 }
 
-void PageActionImageView::OnIconUpdated() {
+void PageActionImageView::UpdateState() {
   UpdateVisibility(GetCurrentWebContents());
 }
 
 views::View* PageActionImageView::GetAsView() {
   return this;
 }
 
 bool PageActionImageView::IsShownInMenu() {
   return false;
 }
 
 views::FocusManager* PageActionImageView::GetFocusManagerForAccelerator() {
   return owner_->GetFocusManager();
 }
 
 views::Widget* PageActionImageView::GetParentForContextMenu() {
   return GetWidget();
 }
 
-ExtensionActionViewController*
+ExtensionActionViewControllerViews*
 PageActionImageView::GetPreferredPopupViewController() {
   return view_controller_.get();
 }
 
 views::View* PageActionImageView::GetReferenceViewForPopup() {
   return this;
 }
 
 views::MenuButton* PageActionImageView::GetContextMenuButton() {
   return NULL;  // No menu button for page action views.
 }
 
 content::WebContents* PageActionImageView::GetCurrentWebContents() const {
   return owner_->GetWebContents();
 }
 
 void PageActionImageView::HideActivePopup() {
   // The only popup that will be active is this popup.
   view_controller_->HidePopup();
 }