Move ExtensionAction from common/ to browser/.

chrome/browser/ui/gtk/extensions/extension_installed_bubble_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/extensions/extension_installed_bubble_gtk.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/commands/command_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h"
 #include "chrome/browser/ui/gtk/browser_toolbar_gtk.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
 #include "chrome/browser/ui/singleton_tabs.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/url_constants.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/gtk_util.h"
 
@@ skipping 114 matching lines @@
     // If the widget is not visible then browser_window could be incognito
     // with this extension disabled. Try showing it on the chevron.
     // If that fails, fall back to default position.
     if (reference_widget && !gtk_widget_get_visible(reference_widget)) {
       reference_widget = gtk_widget_get_visible(toolbar->chevron()) ?
           toolbar->chevron() : NULL;
     }
   } else if (type_ == PAGE_ACTION) {
     LocationBarViewGtk* location_bar_view =
         browser_window->GetToolbar()->GetLocationBarView();
-    location_bar_view->SetPreviewEnabledPageAction(extension_->page_action(),
+    ExtensionAction* page_action = GetPageAction(browser_->profile(),
+                                                 *extension_);
+    location_bar_view->SetPreviewEnabledPageAction(page_action,
                                                    true);  // preview_enabled
-    reference_widget = location_bar_view->GetPageActionWidget(
-        extension_->page_action());
+    reference_widget = location_bar_view->GetPageActionWidget(page_action);
     // glib delays recalculating layout, but we need reference_widget to know
     // its coordinates, so we force a check_resize here.
     gtk_container_check_resize(GTK_CONTAINER(
         browser_window->GetToolbar()->widget()));
     DCHECK(reference_widget);
   } else if (type_ == OMNIBOX_KEYWORD) {
     LocationBarViewGtk* location_bar_view =
         browser_window->GetToolbar()->GetLocationBarView();
     reference_widget = location_bar_view->location_entry_widget();
     DCHECK(reference_widget);
@@ skipping 196 matching lines @@
 
 void ExtensionInstalledBubbleGtk::BubbleClosing(BubbleGtk* bubble,
                                                 bool closed_by_escape) {
   if (extension_ && type_ == PAGE_ACTION) {
     // Turn the page action preview off.
     BrowserWindowGtk* browser_window =
           BrowserWindowGtk::GetBrowserWindowForNativeWindow(
               browser_->window()->GetNativeWindow());
     LocationBarViewGtk* location_bar_view =
         browser_window->GetToolbar()->GetLocationBarView();
-    location_bar_view->SetPreviewEnabledPageAction(extension_->page_action(),
+    ExtensionAction* page_action = GetPageAction(browser_->profile(),
+                                                 *extension_);
+    location_bar_view->SetPreviewEnabledPageAction(page_action,
                                                    false);  // preview_enabled
   }
 
   // We need to allow the bubble to close and remove the widgets from
   // the window before we call Release() because close_button_ depends
   // on all references being cleared before it is destroyed.
   MessageLoopForUI::current()->PostTask(
       FROM_HERE,
       base::Bind(&ExtensionInstalledBubbleGtk::Close, this));
 }
 
 void ExtensionInstalledBubbleGtk::Close() {
   Release();  // Balanced in ctor.
   bubble_ = NULL;
 }