[Search] No longer reverting omnibox text on instant search

chrome/browser/ui/search/search_tab_helper.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/search/search_tab_helper.h"
 
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/search_engines/template_url_service.h"
+#include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(chrome::search::SearchTabHelper)
@@ skipping 73 matching lines @@
     const content::NotificationDetails& details) {
   DCHECK_EQ(content::NOTIFICATION_NAV_ENTRY_COMMITTED, type);
   content::LoadCommittedDetails* committed_details =
       content::Details<content::LoadCommittedDetails>(details).ptr();
   // See comment in |NavigateToPendingEntry()| about why |!IsNTP()| is used.
   if (!IsNTP(committed_details->entry->GetURL())) {
     UpdateModelBasedOnURL(committed_details->entry->GetURL(),
                           !is_initial_navigation_commit_);
   }
   is_initial_navigation_commit_ = false;
+
+  // Update the extracted search terms (if any) in the model.
+  if (web_contents()) {

[sky, 2012/12/12 22:41:57]

Do you really need this if?

[Mathieu, 2012/12/12 23:37:24]

It comes from SearchModel and it is marked as "weak" over there, so I wanted to
make sure.

[sky, 2012/12/13 00:48:18]

From WebContentsUserData:

// A base class for classes attached to, and scoped to, the lifetime of a
// WebContents. For example:

The if isn't needed.

+    const content::NavigationController* navigation_controller =
+        &web_contents()->GetController();
+    if (navigation_controller) {

[sky, 2012/12/12 22:41:57]

There is always a NavigationController.

[Mathieu, 2012/12/12 23:37:24]

Done.

+      content::NavigationEntry* entry = navigation_controller->GetActiveEntry();

[sky, 2012/12/12 22:41:57]

Use committed_details->entry

[Mathieu, 2012/12/12 23:37:24]

Done.

+      Profile* profile =
+          Profile::FromBrowserContext(web_contents()->GetBrowserContext());
+      TemplateURLService* template_url_service =
+          TemplateURLServiceFactory::GetForProfile(profile);
+      string16 search_terms =
+          template_url_service->TryToExtractSearchTermsFromURL(entry->GetURL());
+      if (!search_terms.empty())
+        entry->SetSearchTerms(search_terms);
+    }
+  }
 }
 
 void SearchTabHelper::UpdateModelBasedOnURL(const GURL& url, bool animate) {
   Mode::Type type = Mode::MODE_DEFAULT;
   Mode::Origin origin = Mode::ORIGIN_DEFAULT;
   if (IsNTP(url)) {
     type = Mode::MODE_NTP;
     origin = Mode::ORIGIN_NTP;
   } else if (google_util::IsInstantExtendedAPIGoogleSearchUrl(url.spec())) {
     type = Mode::MODE_SEARCH_RESULTS;
     origin = Mode::ORIGIN_SEARCH;
   }
   if (user_input_in_progress_)
     type = Mode::MODE_SEARCH_SUGGESTIONS;
   model_.SetMode(Mode(type, origin, animate));
 }
 
 const content::WebContents* SearchTabHelper::web_contents() const {
   return model_.web_contents();
 }
 
 }  // namespace search
 }  // namespace chrome