Re-factor location bar/toolbar code to get rid of the browser dependency.

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/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
 using content::WebContents;
 
 PageActionImageView::PageActionImageView(LocationBarView* owner,
-                                         ExtensionAction* page_action)
+                                         ExtensionAction* page_action,
+                                         Browser* browser)
     : owner_(owner),
       page_action_(page_action),
+      browser_(browser),
       ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)),
       current_tab_id_(-1),
       preview_enabled_(false),
       popup_(NULL) {
-  const Extension* extension = owner_->browser()->profile()->
-      GetExtensionService()->GetExtensionById(page_action->extension_id(),
-                                              false);
+  const Extension* extension = owner_->profile()->GetExtensionService()->
+      GetExtensionById(page_action->extension_id(), false);
   DCHECK(extension);
 
   // Load all the icons declared in the manifest. This is the contents of the
   // icons array, plus the default_icon property, if any.
   std::vector<std::string> icon_paths(*page_action->icon_paths());
   if (!page_action_->default_icon_path().empty())
     icon_paths.push_back(page_action_->default_icon_path());
 
   for (std::vector<std::string>::iterator iter = icon_paths.begin();
        iter != icon_paths.end(); ++iter) {
     tracker_.LoadImage(extension, extension->GetResource(*iter),
                        gfx::Size(Extension::kPageActionIconMaxSize,
                                  Extension::kPageActionIconMaxSize),
                        ImageLoadingTracker::DONT_CACHE);
   }
 
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(
-                     owner_->browser()->profile()->GetOriginalProfile()));
+                     owner_->profile()->GetOriginalProfile()));
 
   set_accessibility_focusable(true);
 
   // Iterate through all the keybindings and see if one is assigned to the
   // pageAction.
   const std::vector<Extension::ExtensionKeybinding>& commands =
       extension->keybindings();
   for (size_t i = 0; i < commands.size(); ++i) {
     if (commands[i].command_name() ==
         extension_manifest_values::kPageActionKeybindingEvent) {
@@ skipping 29 matching lines @@
 
     // If we were already showing, then treat this click as a dismiss.
     if (popup_showing)
       return;
 
     views::BubbleBorder::ArrowLocation arrow_location = base::i18n::IsRTL() ?
         views::BubbleBorder::TOP_LEFT : views::BubbleBorder::TOP_RIGHT;
 
     popup_ = ExtensionPopup::ShowPopup(
         page_action_->GetPopupUrl(current_tab_id_),
-        owner_->browser(),
+        browser_,
         this,
         arrow_location,
         inspect_with_devtools);
     popup_->GetWidget()->AddObserver(this);
   } else {
-    Profile* profile = owner_->browser()->profile();
+    Profile* profile = owner_->profile();
     ExtensionService* service = profile->GetExtensionService();
     service->browser_event_router()->PageActionExecuted(
         profile, page_action_->extension_id(), page_action_->id(),
         current_tab_id_, current_url_.spec(), button);
   }
 }
 
 void PageActionImageView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
   state->name = UTF8ToUTF16(tooltip_);
@@ skipping 27 matching lines @@
   if (event.key_code() == ui::VKEY_SPACE ||
       event.key_code() == ui::VKEY_RETURN) {
     ExecuteAction(1, false);
     return true;
   }
   return false;
 }
 
 void PageActionImageView::ShowContextMenu(const gfx::Point& p,
                                           bool is_mouse_gesture) {
-  const Extension* extension = owner_->browser()->profile()->
-      GetExtensionService()->GetExtensionById(page_action()->extension_id(),
-                                              false);
+  const Extension* extension = owner_->profile()->GetExtensionService()->
+      GetExtensionById(page_action()->extension_id(), false);
   if (!extension->ShowConfigureContextMenus())
     return;
 
   scoped_refptr<ExtensionContextMenuModel> context_menu_model(
-      new ExtensionContextMenuModel(extension, owner_->browser(), this));
+      new ExtensionContextMenuModel(extension, browser_, this));
   views::MenuModelAdapter menu_model_adapter(context_menu_model.get());
   menu_runner_.reset(new views::MenuRunner(menu_model_adapter.CreateMenu()));
   gfx::Point screen_loc;
   views::View::ConvertPointToScreen(this, &screen_loc);
   if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(screen_loc, size()),
           views::MenuItemView::TOPLEFT, views::MenuRunner::HAS_MNEMONICS) ==
       views::MenuRunner::MENU_DELETED)
     return;
 }
 
@@ skipping 101 matching lines @@
   const Extension* unloaded_extension =
       content::Details<UnloadedExtensionInfo>(details)->extension;
   if (page_action_ == unloaded_extension ->page_action())
     owner_->UpdatePageActions();
 }
 
 void PageActionImageView::HidePopup() {
   if (popup_)
     popup_->GetWidget()->Close();
 }