Move ExtensionAction from common/ to browser/.

chrome/browser/ui/gtk/browser_actions_toolbar_gtk.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/gtk/browser_actions_toolbar_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 16 matching lines @@
 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/hover_controller_gtk.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "chrome/browser/ui/gtk/view_id_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_action.h"
+#include "chrome/browser/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/accelerators/accelerator_gtk.h"
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia_paint.h"
@@ skipping 62 matching lines @@
         IDR_BROWSER_ACTION,
         IDR_BROWSER_ACTION_P,
         IDR_BROWSER_ACTION_H,
         0,
         NULL));
     gtk_widget_set_size_request(button(), kButtonWidth, kButtonWidth);
     alignment_.Own(gtk_alignment_new(0, 0, 1, 1));
     gtk_container_add(GTK_CONTAINER(alignment_.get()), button());
     gtk_widget_show(button());
 
-    DCHECK(extension_->browser_action());
+    DCHECK(browser_action());
 
     // The Browser Action API does not allow the default icon path to be
     // changed at runtime, so we can load this now and cache it.
-    std::string path = extension_->browser_action()->default_icon_path();
+    std::string path = browser_action()->default_icon_path();
     if (!path.empty()) {
       tracker_.LoadImage(extension_, extension_->GetResource(path),
                          gfx::Size(Extension::kBrowserActionIconMaxSize,
                                    Extension::kBrowserActionIconMaxSize),
                          ImageLoadingTracker::DONT_CACHE);
     }
 
     UpdateState();
 
     signals_.Connect(button(), "button-press-event",
@@ skipping 10 matching lines @@
       // is reloaded.
       ConnectBrowserActionPopupAccelerator();
     } else {
       // Window doesn't exist yet, wait for it.
       signals_.Connect(toolbar->widget(), "realize",
                        G_CALLBACK(OnRealize), this);
     }
 
     registrar_.Add(
         this, chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
-        content::Source<ExtensionAction>(extension->browser_action()));
+        content::Source<ExtensionAction>(browser_action()));
     registrar_.Add(
         this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
         content::Source<Profile>(
             toolbar->browser()->profile()->GetOriginalProfile()));
     registrar_.Add(
         this, chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED,
         content::Source<Profile>(
         toolbar->browser()->profile()->GetOriginalProfile()));
     registrar_.Add(
         this, chrome::NOTIFICATION_EXTENSION_COMMAND_REMOVED,
@@ skipping 49 matching lines @@
      default:
       NOTREACHED();
       break;
     }
   }
 
   // ImageLoadingTracker::Observer implementation.
   void OnImageLoaded(const gfx::Image& image,
                      const std::string& extension_id,
                      int index) OVERRIDE {
-    extension_->browser_action()->CacheIcon(
-        extension_->browser_action()->default_icon_path(), image);
+    browser_action()->CacheIcon(browser_action()->default_icon_path(), image);
     UpdateState();
   }
 
   // Updates the button based on the latest state from the associated
   // browser action.
   void UpdateState() {
     int tab_id = toolbar_->GetCurrentTabId();
     if (tab_id < 0)
       return;
 
-    std::string tooltip = extension_->browser_action()->GetTitle(tab_id);
+    std::string tooltip = browser_action()->GetTitle(tab_id);
     if (tooltip.empty())
       gtk_widget_set_has_tooltip(button(), FALSE);
     else
       gtk_widget_set_tooltip_text(button(), tooltip.c_str());
 
-    gfx::Image image = extension_->browser_action()->GetIcon(tab_id);
+    gfx::Image image = browser_action()->GetIcon(tab_id);
     if (!image.IsEmpty())
       SetImage(image.ToGdkPixbuf());
-    bool enabled = extension_->browser_action()->GetIsVisible(tab_id);
+    bool enabled = browser_action()->GetIsVisible(tab_id);
     gtk_widget_set_sensitive(button(), enabled);
 
     gtk_widget_queue_draw(button());
   }
 
   gfx::Image GetIcon() {
-    return extension_->browser_action()->GetIcon(
+    return browser_action()->GetIcon(
         toolbar_->GetCurrentTabId());
   }
 
   MenuGtk* GetContextMenu() {
     if (!extension_->ShowConfigureContextMenus())
       return NULL;
 
     context_menu_model_ =
         new ExtensionContextMenuModel(extension_, toolbar_->browser(), this);
     context_menu_.reset(
@@ skipping 72 matching lines @@
     action->Activate(widget);
   }
 
   static gboolean OnExposeEvent(GtkWidget* widget,
                                 GdkEventExpose* event,
                                 BrowserActionButton* button) {
     int tab_id = button->toolbar_->GetCurrentTabId();
     if (tab_id < 0)
       return FALSE;
 
-    ExtensionAction* action = button->extension_->browser_action();
+    ExtensionAction* action = button->browser_action();
     if (action->GetBadgeText(tab_id).empty())
       return FALSE;
 
     gfx::CanvasSkiaPaint canvas(event, false);
     GtkAllocation allocation;
     gtk_widget_get_allocation(widget, &allocation);
     action->PaintBadge(&canvas, gfx::Rect(allocation), tab_id);
     return FALSE;
   }
 
@@ skipping 80 matching lines @@
       accel_group_ = NULL;
       keybinding_.reset(NULL);
 
       // We've removed the accelerator, so no need to listen to this anymore.
       registrar_.Remove(this,
                         chrome::NOTIFICATION_WINDOW_CLOSED,
                         content::Source<GtkWindow>(window));
     }
   }
 
+  ExtensionAction* browser_action() {
+    return GetBrowserAction(toolbar_->browser()->profile(), *extension_);
+  }
+
   // The toolbar containing this button.
   BrowserActionsToolbarGtk* toolbar_;
 
   // The extension that contains this browser action.
   const Extension* extension_;
 
   // The button for this browser action.
   scoped_ptr<CustomDrawButton> button_;
 
   // The top level widget (parent of |button_|).
@@ skipping 335 matching lines @@
   gtk_widget_set_size_request(button_hbox_.get(), desired_width_, -1);
   UpdateChevronVisibility();
 }
 
 bool BrowserActionsToolbarGtk::IsCommandIdChecked(int command_id) const {
   return false;
 }
 
 bool BrowserActionsToolbarGtk::IsCommandIdEnabled(int command_id) const {
   const Extension* extension = model_->toolbar_items()[command_id];
-  return extension->browser_action()->GetIsVisible(GetCurrentTabId());
+  return GetBrowserAction(profile_, *extension)->
+      GetIsVisible(GetCurrentTabId());
 }
 
 bool BrowserActionsToolbarGtk::GetAcceleratorForCommandId(
     int command_id,
     ui::Accelerator* accelerator) {
   return false;
 }
 
 void BrowserActionsToolbarGtk::ExecuteCommand(int command_id) {
   const Extension* extension = model_->toolbar_items()[command_id];
@@ skipping 281 matching lines @@
 
   menu->PopupAsContext(gfx::Point(event->x_root, event->y_root),
                        event->time);
   return TRUE;
 }
 
 void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) {
   if (!resize_animation_.is_animating())
     UpdateChevronVisibility();
 }