Remove TabContents from OmniboxEditController and friends.

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/location_bar_controller.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/browser_tabstrip.h"
 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h"
 #include "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 #import "chrome/browser/ui/cocoa/first_run_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/page_action_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/plus_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/web_intents_button_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h"
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
 #include "chrome/browser/ui/omnibox/location_bar_util.h"
 #import "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/feature_switch.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
@@ skipping 265 matching lines @@
 }
 
 string16 LocationBarViewMac::GetTitle() const {
   return browser_->GetWindowTitleForCurrentTab();
 }
 
 InstantController* LocationBarViewMac::GetInstant() {
   return browser_->instant_controller()->instant();
 }
 
-TabContents* LocationBarViewMac::GetTabContents() const {
-  return chrome::GetActiveTabContents(browser_);
-}
-
 void LocationBarViewMac::Revert() {
   omnibox_view_->RevertAll();
 }
 
 const OmniboxView* LocationBarViewMac::GetLocationEntry() const {
   return omnibox_view_.get();
 }
 
 OmniboxView* LocationBarViewMac::GetLocationEntry() {
   return omnibox_view_.get();
@@ skipping 11 matching lines @@
 int LocationBarViewMac::PageActionVisibleCount() {
   int result = 0;
   for (size_t i = 0; i < page_action_decorations_.size(); ++i) {
     if (page_action_decorations_[i]->IsVisible())
       ++result;
   }
   return result;
 }
 
 WebContents* LocationBarViewMac::GetWebContents() const {
-  return chrome::GetActiveWebContents(browser_);
+  return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
 PageActionDecoration* LocationBarViewMac::GetPageActionDecoration(
     ExtensionAction* page_action) {
   DCHECK(page_action);
   for (size_t i = 0; i < page_action_decorations_.size(); ++i) {
     if (page_action_decorations_[i]->page_action() == page_action)
       return page_action_decorations_[i];
   }
   // If |page_action| is the browser action of an extension, no element in
@@ skipping 194 matching lines @@
         return;
 
       [field_ updateMouseTracking];
       [field_ setNeedsDisplay:YES];
       break;
     }
 
     case chrome::NOTIFICATION_EXTENSION_LOCATION_BAR_UPDATED: {
       // Only update if the updated action box was for the active tab contents.
       WebContents* target_tab = content::Details<WebContents>(details).ptr();
-      if (target_tab == GetTabContents()->web_contents())
+      if (target_tab == GetWebContents())
         UpdatePageActions();
       break;
     }
 
     default:
       NOTREACHED() << "Unexpected notification";
       break;
   }
 }
 
 void LocationBarViewMac::OnPreferenceChanged(PrefServiceBase* service,
                                              const std::string& pref_name) {
   UpdateStarDecorationVisibility();
   OnChanged();
 }
 
 void LocationBarViewMac::PostNotification(NSString* notification) {
   [[NSNotificationCenter defaultCenter] postNotificationName:notification
                                         object:[NSValue valueWithPointer:this]];
 }
 
 bool LocationBarViewMac::RefreshContentSettingsDecorations() {
   const bool input_in_progress = toolbar_model_->GetInputInProgress();
-  WebContents* web_contents =
-      input_in_progress ? NULL : chrome::GetActiveWebContents(browser_);
+  WebContents* web_contents = input_in_progress ?
+      NULL : browser_->tab_strip_model()->GetActiveWebContents();
   bool icons_updated = false;
   for (size_t i = 0; i < content_setting_decorations_.size(); ++i) {
     icons_updated |=
         content_setting_decorations_[i]->UpdateFromWebContents(web_contents);
   }
   return icons_updated;
 }
 
 void LocationBarViewMac::DeletePageActionDecorations() {
   // TODO(shess): Deleting these decorations could result in the cell
   // refering to them before things are laid out again.  Meanwhile, at
   // least fail safe.
   [[field_ cell] clearDecorations];
 
   page_action_decorations_.clear();
 }
 
 void LocationBarViewMac::RefreshPageActionDecorations() {
   if (!IsEditable()) {
     DeletePageActionDecorations();
     return;
   }
 
-  TabContents* tab_contents = GetTabContents();
-  if (!tab_contents) {
+  WebContents* web_contents = GetWebContents();
+  if (!web_contents) {
     DeletePageActionDecorations();  // Necessary?
     return;
   }
 
   std::vector<ExtensionAction*> new_page_actions =
-      extensions::TabHelper::FromWebContents(tab_contents->web_contents())->
+      extensions::TabHelper::FromWebContents(web_contents)->
           location_bar_controller()->GetCurrentActions();
 
   if (new_page_actions != page_actions_) {
     page_actions_.swap(new_page_actions);
     DeletePageActionDecorations();
     for (size_t i = 0; i < page_actions_.size(); ++i) {
       page_action_decorations_.push_back(
           new PageActionDecoration(this, browser_, page_actions_[i]));
     }
   }
 
   GURL url = toolbar_model_->GetURL();
   for (size_t i = 0; i < page_action_decorations_.size(); ++i) {
     page_action_decorations_[i]->UpdateVisibility(
-        toolbar_model_->GetInputInProgress() ?
-            NULL : tab_contents->web_contents(),
+        toolbar_model_->GetInputInProgress() ? NULL : web_contents,
         url);
   }
 }
 
 void LocationBarViewMac::RefreshWebIntentsButtonDecoration() {
-  TabContents* tab_contents = GetTabContents();
-  if (!tab_contents) {
+  WebContents* web_contents = GetWebContents();
+  if (!web_contents) {
     web_intents_button_decoration_->SetVisible(false);
     return;
   }
 
-  web_intents_button_decoration_->Update(tab_contents);
+  web_intents_button_decoration_->Update(web_contents);
 }
 
 // TODO(shess): This function should over time grow to closely match
 // the views Layout() function.
 void LocationBarViewMac::Layout() {
   AutocompleteTextFieldCell* cell = [field_ cell];
 
   // Reset the left-hand decorations.
   // TODO(shess): Shortly, this code will live somewhere else, like in
   // the constructor.  I am still wrestling with how best to deal with
@@ skipping 72 matching lines @@
 }
 
 bool LocationBarViewMac::IsStarEnabled() {
   return [field_ isEditable] &&
          browser_defaults::bookmarks_enabled &&
          !toolbar_model_->GetInputInProgress() &&
          edit_bookmarks_enabled_.GetValue();
 }
 
 void LocationBarViewMac::UpdateZoomDecoration() {
-  TabContents* tab_contents = GetTabContents();
-  if (!tab_contents)
+  WebContents* web_contents = GetWebContents();
+  if (!web_contents)
     return;
 
-  ZoomController* zoom_controller =
-      ZoomController::FromWebContents(tab_contents->web_contents());
-  zoom_decoration_->Update(zoom_controller);
+  zoom_decoration_->Update(ZoomController::FromWebContents(web_contents));
 }
 
 void LocationBarViewMac::UpdateStarDecorationVisibility() {
   // If the action box is enabled, only show the star if it's lit.
   bool visible = IsStarEnabled();
   if (!star_decoration_->starred() &&
       extensions::FeatureSwitch::action_box()->IsEnabled())
     visible = false;
   star_decoration_->SetVisible(visible);
 }
 
 void LocationBarViewMac::UpdatePlusDecorationVisibility() {
   if (extensions::FeatureSwitch::action_box()->IsEnabled()) {
     // If the action box is enabled, hide it when input is in progress.
     plus_decoration_->SetVisible(!toolbar_model_->GetInputInProgress());
   }
 }