Remove TabContents from OmniboxEditController and friends.

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/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/commands/command_service_factory.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_icon_factory.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/location_bar_controller.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/webui/extensions/extension_info_ui.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/events/event.h"
 #include "ui/gfx/canvas.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;
 using extensions::LocationBarController;
 using extensions::Extension;
 
 PageActionImageView::PageActionImageView(LocationBarView* owner,
                                          ExtensionAction* page_action,
                                          Browser* browser)
     : owner_(owner),
       page_action_(page_action),
       browser_(browser),
       current_tab_id_(-1),
       preview_enabled_(false),
       popup_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(scoped_icon_animation_observer_(
           page_action->GetIconAnimation(
-              SessionID::IdForTab(owner->GetTabContents()->web_contents())),
+              SessionID::IdForTab(owner->GetWebContents())),
           this)) {
   const Extension* extension = owner_->profile()->GetExtensionService()->
       GetExtensionById(page_action->extension_id(), false);
   DCHECK(extension);
 
   icon_factory_.reset(
       new ExtensionActionIconFactory(extension, page_action, this));
 
   set_accessibility_focusable(true);
   set_context_menu_controller(this);
@@ skipping 43 matching lines @@
     }
   }
 
   if (popup_)
     popup_->GetWidget()->RemoveObserver(this);
   HidePopup();
 }
 
 void PageActionImageView::ExecuteAction(
     ExtensionPopup::ShowAction show_action) {
-  TabContents* tab_contents = owner_->GetTabContents();
-  if (!tab_contents)
+  WebContents* web_contents = owner_->GetWebContents();
+  if (!web_contents)
     return;
 
   extensions::TabHelper* extensions_tab_helper =
-      extensions::TabHelper::FromWebContents(tab_contents->web_contents());
+      extensions::TabHelper::FromWebContents(web_contents);
   LocationBarController* controller =
       extensions_tab_helper->location_bar_controller();
 
   switch (controller->OnClicked(page_action_->extension_id(), 1)) {
     case LocationBarController::ACTION_NONE:
       break;
 
     case LocationBarController::ACTION_SHOW_POPUP:
       ShowPopupWithURL(page_action_->GetPopupUrl(current_tab_id_), show_action);
       break;
@@ skipping 110 matching lines @@
   ExecuteAction(ExtensionPopup::SHOW_AND_INSPECT);
 }
 
 void PageActionImageView::OnWidgetClosing(views::Widget* widget) {
   DCHECK_EQ(popup_->GetWidget(), widget);
   popup_->GetWidget()->RemoveObserver(this);
   popup_ = NULL;
 }
 
 void PageActionImageView::OnIconUpdated() {
-  TabContents* tab_contents = owner_->GetTabContents();
-  if (tab_contents)
-    UpdateVisibility(tab_contents->web_contents(), current_url_);
+  WebContents* web_contents = owner_->GetWebContents();
+  if (web_contents)
+    UpdateVisibility(web_contents, current_url_);
 }
 
 void PageActionImageView::OnIconChanged() {
   OnIconUpdated();
 }
 
 void PageActionImageView::PaintChildren(gfx::Canvas* canvas) {
   View::PaintChildren(canvas);
   if (current_tab_id_ >= 0)
     page_action_->PaintBadge(canvas, GetLocalBounds(), current_tab_id_);
@@ skipping 16 matching lines @@
 
   popup_ = ExtensionPopup::ShowPopup(popup_url, browser_, this, arrow_location,
                                      show_action);
   popup_->GetWidget()->AddObserver(this);
 }
 
 void PageActionImageView::HidePopup() {
   if (popup_)
     popup_->GetWidget()->Close();
 }