[Search] Store and recall search terms using NavigationEntry to improve search term extraction

chrome/browser/ui/toolbar/toolbar_model_impl.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/ui/toolbar/toolbar_model_impl.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/google/google_util.h"
+#include "chrome/browser/instant/instant_controller.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/ssl/ssl_error_info.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 44 matching lines @@
       input_in_progress_(false) {
 }
 
 ToolbarModelImpl::~ToolbarModelImpl() {
 }
 
 // ToolbarModelImpl Implementation.
 string16 ToolbarModelImpl::GetText(
     bool display_search_urls_as_search_terms) const {
   if (display_search_urls_as_search_terms) {
+    // If search terms were set explicitely on the NavigationEntry, use those.

[sky, 2013/01/16 22:32:37]

explicitly

[Mathieu, 2013/01/17 15:59:29]

Done.

+    NavigationController* controller = GetNavigationController();
+    if (controller) {
+      NavigationEntry* entry = controller->GetVisibleEntry();
+      if (entry) {
+        string16 out_value;
+        if (entry->GetExtraData(InstantController::kSearchTermsKey,
+                                &out_value))
+          return out_value;
+      }
+    }
     string16 search_terms = TryToExtractSearchTermsFromURL();
     if (!search_terms.empty())
       return search_terms;
   }
   std::string languages;  // Empty if we don't have a |navigation_controller|.
   Profile* profile = GetProfile();
   if (profile)
     languages = profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
 
   GURL url(GetURL());
@@ skipping 176 matching lines @@
   template_url->ExtractSearchTermsFromURL(url, &result);
   return result;
 }
 
 Profile* ToolbarModelImpl::GetProfile() const {
   NavigationController* navigation_controller = GetNavigationController();
   return navigation_controller ?
       Profile::FromBrowserContext(navigation_controller->GetBrowserContext()) :
       NULL;
 }