Persist the Instant API to committed search result pages.

chrome/browser/ui/search/search_tab_helper.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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/ui/search/search.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
@@ skipping 20 matching lines @@
 
 }  // namespace
 
 namespace chrome {
 namespace search {
 
 SearchTabHelper::SearchTabHelper(content::WebContents* web_contents)
     : WebContentsObserver(web_contents),
       is_search_enabled_(IsSearchEnabled(web_contents)),
       is_initial_navigation_commit_(true),
+      user_input_in_progress_(false),
       model_(web_contents) {
   if (!is_search_enabled_)
     return;
 
   registrar_.Add(
       this,
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<content::NavigationController>(
           &web_contents->GetController()));
 }
 
 SearchTabHelper::~SearchTabHelper() {
 }
 
 void SearchTabHelper::OmniboxEditModelChanged(bool user_input_in_progress,
                                               bool cancelling) {
   if (!is_search_enabled_)
     return;
 
-  if (user_input_in_progress) {
-    const Mode new_mode = Mode(Mode::MODE_SEARCH_SUGGESTIONS,
-                               model_.mode().origin, true);
-    model_.SetMode(new_mode);
-  } else if (cancelling) {
-    UpdateModelBasedOnURL(web_contents()->GetURL(), true);
-  }
+  user_input_in_progress_ = user_input_in_progress;
+  if (!user_input_in_progress && !cancelling)
+    return;
+
+  UpdateModelBasedOnURL(web_contents()->GetURL(), true);
 }
 
 void SearchTabHelper::NavigationEntryUpdated() {
   if (!is_search_enabled_)
     return;
   UpdateModelBasedOnURL(web_contents()->GetURL(), true);
 }
 
 void SearchTabHelper::NavigateToPendingEntry(
     const GURL& url,
@@ skipping 27 matching lines @@
 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