Change infobar creation to use a public static Create() method on the infobar delegate classes.

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 25 matching lines @@
 #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;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(OmniboxSearchHint);
 
-// 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:
+  // If the active entry for |web_contents| is a navigation to the user's
+  // default search engine, and the engine is on a small whitelist, creates a
+  // "you can search from the omnibox" hint delegate and adds it to the
+  // InfoBarService for |web_contents|.
+  static void Create(content::WebContents* web_contents,
+                     OmniboxSearchHint* omnibox_hint);
+
+ private:
   HintInfoBar(OmniboxSearchHint* omnibox_hint,
               InfoBarService* infobar_service);
-
- private:
   virtual ~HintInfoBar();
 
   void AllowExpiry() { should_expire_ = true; }
 
   // ConfirmInfoBarDelegate:
   virtual void InfoBarDismissed() OVERRIDE;
   virtual gfx::Image* GetIcon() const OVERRIDE;
   virtual Type GetInfoBarType() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual int GetButtons() const OVERRIDE;
@@ skipping 10 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);
 };
 
+// static
+void HintInfoBar::Create(content::WebContents* web_contents,
+                         OmniboxSearchHint* omnibox_hint) {
+  // 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/",
+  };
+  CR_DEFINE_STATIC_LOCAL(std::set<std::string>, search_engine_urls, ());
+  if (search_engine_urls.empty()) {
+    for (size_t i = 0; i < arraysize(kSearchEngineURLs); ++i)
+      search_engine_urls.insert(kSearchEngineURLs[i]);
+  }
+
+  content::NavigationEntry* entry =
+      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(profile)->
+          GetDefaultSearchProvider();
+  if (!default_provider)
+    return;
+
+  if (default_provider->url_ref().GetHost() == entry->GetURL().host()) {
+    InfoBarService* infobar_service =
+        InfoBarService::FromWebContents(web_contents);
+    infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+        new HintInfoBar(omnibox_hint, infobar_service)));
+  }
+}
+
 HintInfoBar::HintInfoBar(OmniboxSearchHint* omnibox_hint,
                          InfoBarService* infobar_service)
     : ConfirmInfoBarDelegate(infobar_service),
       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(
@@ skipping 53 matching lines @@
 
 // OmniboxSearchHint ----------------------------------------------------------
 
 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>(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 =
-        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(profile)->
-            GetDefaultSearchProvider();
-    if (!default_provider)
-      return;
-
-    if (default_provider->url_ref().GetHost() == entry->GetURL().host())
-      ShowInfoBar();
+    HintInfoBar::Create(web_contents_, this);
   } 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() {
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents_);
-  infobar_service->AddInfoBar(new HintInfoBar(this, infobar_service));
-}
-
 void OmniboxSearchHint::ShowEnteringQuery() {
   LocationBar* location_bar = chrome::FindBrowserWithWebContents(
       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.
@@ skipping 11 matching lines @@
 }
 
 // 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);
 }