Switch OmniboxSearchHint to use WebContentsUserData.

chrome/browser/omnibox_search_hint.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/omnibox_search_hint.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
@@ skipping 24 matching lines @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.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"
 
 using content::NavigationController;
 using content::NavigationEntry;
 
+int OmniboxSearchHint::kUserDataKey;
+
 // The URLs of search engines for which we want to trigger the infobar.
 const char* const kSearchEngineURLs[] = {
     "http://www.google.com/",
     "http://www.yahoo.com/",
     "http://www.bing.com/",
     "http://www.altavista.com/",
     "http://www.ask.com/",
     "http://www.wolframalpha.com/",
 };
 
 
 // HintInfoBar ----------------------------------------------------------------
 
 class HintInfoBar : public ConfirmInfoBarDelegate {
  public:
-  explicit HintInfoBar(OmniboxSearchHint* omnibox_hint);
+  HintInfoBar(OmniboxSearchHint* omnibox_hint,
+              InfoBarTabHelper* infobar_tab_helper);
 
  private:
   virtual ~HintInfoBar();
 
   void AllowExpiry() { should_expire_ = true; }
 
   // ConfirmInfoBarDelegate:
   virtual void InfoBarDismissed() OVERRIDE;
   virtual gfx::Image* GetIcon() const OVERRIDE;
   virtual Type GetInfoBarType() const OVERRIDE;
@@ skipping 12 matching lines @@
 
   // Whether the info-bar should be dismissed on the next navigation.
   bool should_expire_;
 
   // Used to delay the expiration of the info-bar.
   base::WeakPtrFactory<HintInfoBar> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HintInfoBar);
 };
 
-HintInfoBar::HintInfoBar(OmniboxSearchHint* omnibox_hint)
-    : ConfirmInfoBarDelegate(omnibox_hint->tab()->infobar_tab_helper()),
+HintInfoBar::HintInfoBar(OmniboxSearchHint* omnibox_hint,
+                         InfoBarTabHelper* infobar_tab_helper)
+    : ConfirmInfoBarDelegate(infobar_tab_helper),
       omnibox_hint_(omnibox_hint),
       action_taken_(false),
       should_expire_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   // We want the info-bar to stick-around for few seconds and then be hidden
   // on the next navigation after that.
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&HintInfoBar::AllowExpiry, weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromSeconds(8));
@@ skipping 43 matching lines @@
 }
 
 bool HintInfoBar::ShouldExpireInternal(
     const content::LoadCommittedDetails& details) const {
   return should_expire_;
 }
 
 
 // OmniboxSearchHint ----------------------------------------------------------
 
-OmniboxSearchHint::OmniboxSearchHint(TabContents* tab) : tab_(tab) {
-  NavigationController* controller = &(tab->web_contents()->GetController());
+OmniboxSearchHint::OmniboxSearchHint(content::WebContents* web_contents)
+    : web_contents_(web_contents) {
+  NavigationController* controller = &(web_contents->GetController());
   notification_registrar_.Add(
       this,
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<NavigationController>(controller));
   // Fill the search_engine_urls_ map, used for faster look-up (overkill?).
   for (size_t i = 0; i < arraysize(kSearchEngineURLs); ++i)
     search_engine_urls_[kSearchEngineURLs[i]] = 1;
 
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents->GetBrowserContext());
   // Listen for omnibox to figure-out when the user searches from the omnibox.
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_OMNIBOX_OPENED_URL,
-                              content::Source<Profile>(tab->profile()));
+                              content::Source<Profile>(profile));
 }
 
 OmniboxSearchHint::~OmniboxSearchHint() {
 }
 
 void OmniboxSearchHint::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     content::NavigationEntry* entry =
-        tab_->web_contents()->GetController().GetActiveEntry();
+        web_contents_->GetController().GetActiveEntry();
     if (search_engine_urls_.find(entry->GetURL().spec()) ==
         search_engine_urls_.end()) {
       // The search engine is not in our white-list, bail.
       return;
     }
+    Profile* profile =
+        Profile::FromBrowserContext(web_contents_->GetBrowserContext());
     const TemplateURL* const default_provider =
-        TemplateURLServiceFactory::GetForProfile(tab_->profile())->
-        GetDefaultSearchProvider();
+        TemplateURLServiceFactory::GetForProfile(profile)->
+            GetDefaultSearchProvider();
     if (!default_provider)
       return;
 
     if (default_provider->url_ref().GetHost() == entry->GetURL().host())
       ShowInfoBar();
   } else if (type == chrome::NOTIFICATION_OMNIBOX_OPENED_URL) {
     AutocompleteLog* log = content::Details<AutocompleteLog>(details).ptr();
     AutocompleteMatch::Type type =
         log->result.match_at(log->selected_index).type;
     if (AutocompleteMatch::IsSearchType(type)) {
       // The user performed a search from the omnibox, don't show the infobar
       // again.
       DisableHint();
     }
   }
 }
 
 void OmniboxSearchHint::ShowInfoBar() {
-  tab_->infobar_tab_helper()->AddInfoBar(new HintInfoBar(this));
+  InfoBarTabHelper* infobar_tab_helper =
+      TabContents::FromWebContents(web_contents_)->infobar_tab_helper();
+  infobar_tab_helper->AddInfoBar(new HintInfoBar(this, infobar_tab_helper));
 }
 
 void OmniboxSearchHint::ShowEnteringQuery() {
   LocationBar* location_bar = browser::FindBrowserWithWebContents(
-      tab_->web_contents())->window()->GetLocationBar();
+      web_contents_)->window()->GetLocationBar();
   OmniboxView* omnibox_view = location_bar->GetLocationEntry();
   location_bar->FocusLocation(true);
   omnibox_view->SetUserText(
       l10n_util::GetStringUTF16(IDS_OMNIBOX_SEARCH_HINT_OMNIBOX_TEXT));
   omnibox_view->SelectAll(false);
   // Entering text in the omnibox view triggers the suggestion popup that we
   // don't want to show in this case.
   omnibox_view->CloseOmniboxPopup();
 }
 
 void OmniboxSearchHint::DisableHint() {
   // The NAV_ENTRY_COMMITTED notification was needed to show the infobar, the
   // OMNIBOX_OPENED_URL notification was there to set the kShowOmniboxSearchHint
   // prefs to false, none of them are needed anymore.
   notification_registrar_.RemoveAll();
-  tab_->profile()->GetPrefs()->SetBoolean(prefs::kShowOmniboxSearchHint,
-                                          false);
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents_->GetBrowserContext());
+  profile->GetPrefs()->SetBoolean(prefs::kShowOmniboxSearchHint, false);
 }
 
 // static
 bool OmniboxSearchHint::IsEnabled(Profile* profile) {
   // The infobar can only be shown if the correct switch has been provided and
   // the user did not dismiss the infobar before.
   return profile->GetPrefs()->GetBoolean(prefs::kShowOmniboxSearchHint) &&
       CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kSearchInOmniboxHint);
+          switches::kSearchInOmniboxHint);
 }