Consolidate search terms extraction and Instant process determination.

chrome/browser/instant/instant_controller.cc

 // Copyright 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/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/history_tab_helper.h"
 #include "chrome/browser/instant/instant_ntp.h"
 #include "chrome/browser/instant/instant_overlay.h"
 #include "chrome/browser/instant/instant_tab.h"
 #include "chrome/browser/platform_util.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/search/search.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/escape.h"
 #include "third_party/icu/public/common/unicode/normalizer2.h"
@@ skipping 124 matching lines @@
   return model.height() == 100 && model.height_units() == INSTANT_SIZE_PERCENT;
 }
 
 bool IsContentsFrom(const InstantPage* page,
                     const content::WebContents* contents) {
   return page && (page->contents() == contents);
 }
 
 }  // namespace
 
-// static
-const char* InstantController::kLocalOmniboxPopupURL =
-    "chrome://local-omnibox-popup/local-omnibox-popup.html";
-
 InstantController::InstantController(chrome::BrowserInstantController* browser,
                                      bool extended_enabled)
     : browser_(browser),
       extended_enabled_(extended_enabled),
       instant_enabled_(false),
       use_local_preview_only_(true),
       model_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       last_omnibox_text_has_inline_autocompletion_(false),
       last_verbatim_(false),
       last_transition_type_(content::PAGE_TRANSITION_LINK),
@@ skipping 203 matching lines @@
     instant_tab_->Update(user_text, selection_start, selection_end, verbatim);
   } else {
     if (first_interaction_time_.is_null())
       first_interaction_time_ = base::Time::Now();
     allow_preview_to_show_search_suggestions_ = true;
 
     // For extended mode, if the loader is not ready at this point, switch over
     // to a backup loader.
     if (extended_enabled_ && !overlay_->supports_instant() &&
         !overlay_->IsUsingLocalPreview() && browser_->GetActiveWebContents()) {
-      CreateOverlay(kLocalOmniboxPopupURL, browser_->GetActiveWebContents());
+      CreateOverlay(chrome::search::kLocalOmniboxPopupURL,
+                    browser_->GetActiveWebContents());
     }
 
     overlay_->Update(extended_enabled_ ? user_text : full_text,
                      selection_start, selection_end, verbatim);
   }
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_INSTANT_CONTROLLER_UPDATED,
       content::Source<InstantController>(this),
       content::NotificationService::NoDetails());
@@ skipping 715 matching lines @@
   const content::WebContents* active_tab = browser_->GetActiveWebContents();
   if (!active_tab)
     return false;
 
   Profile* profile = Profile::FromBrowserContext(
       active_tab->GetBrowserContext());
   std::string instant_url;
   if (!GetInstantURL(profile, ignore_blacklist, &instant_url)) {
     // If we are in extended mode, fallback to the local popup.
     if (extended_enabled_)
-      instant_url = kLocalOmniboxPopupURL;
+      instant_url = chrome::search::kLocalOmniboxPopupURL;
     else
       return false;
   }
 
   if (!overlay_ || overlay_->instant_url() != instant_url)
     CreateOverlay(instant_url, active_tab);
 
   return true;
 }
 
@@ skipping 147 matching lines @@
   overlay_->SetPopupBounds(intersection);
 }
 
 bool InstantController::GetInstantURL(Profile* profile,
                                       bool ignore_blacklist,
                                       std::string* instant_url) const {
   DCHECK(profile);
   instant_url->clear();
 
   if (extended_enabled_ && use_local_preview_only_) {
-    *instant_url = kLocalOmniboxPopupURL;
+    *instant_url = chrome::search::kLocalOmniboxPopupURL;
     return true;
   }
 
   const TemplateURL* template_url = TemplateURLServiceFactory::GetForProfile(
       profile)->GetDefaultSearchProvider();
 
   if (!template_url) {
     LOG_INSTANT_DEBUG_EVENT(this, "GetInstantURL: No template URL");
     return false;
   }
@@ skipping 88 matching lines @@
   delete overlay_->ReleaseContents().release();
   MessageLoop::current()->DeleteSoon(FROM_HERE, overlay_.release());
   EnsureOverlayIsCurrent(false);
 }
 
 void InstantController::RemoveFromBlacklist(const std::string& url) {
   if (blacklisted_urls_.erase(url)) {
     RecordEventHistogram(INSTANT_CONTROLLER_EVENT_URL_REMOVED_FROM_BLACKLIST);
   }
 }