Cleanup in SearchTabHelper

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 <memory>
 #include <set>
 
 #include "base/macros.h"
@@ skipping 153 matching lines @@
           Profile::FromBrowserContext(web_contents_->GetBrowserContext()));
   if (instant_service_)
     instant_service_->AddObserver(this);
 }
 
 SearchTabHelper::~SearchTabHelper() {
   if (instant_service_)
     instant_service_->RemoveObserver(this);
 }
 
-void SearchTabHelper::InitForPreloadedNTP() {
-  UpdateMode(true, true);
-}
-
 void SearchTabHelper::OmniboxInputStateChanged() {
   if (!is_search_enabled_)
     return;
 
-  UpdateMode(false, false);
+  UpdateMode(false);
 }
 
 void SearchTabHelper::OmniboxFocusChanged(OmniboxFocusState state,
                                           OmniboxFocusChangeReason reason) {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_OMNIBOX_FOCUS_CHANGED,
       content::Source<SearchTabHelper>(this),
       content::NotificationService::NoDetails());
 
   ipc_router_.OmniboxFocusChanged(state, reason);
@@ skipping 19 matching lines @@
           web_contents_->GetController().GetDefaultSessionStorageNamespace(),
           web_contents_->GetContainerBounds().size());
     }
   }
 }
 
 void SearchTabHelper::NavigationEntryUpdated() {
   if (!is_search_enabled_)
     return;
 
-  UpdateMode(false, false);
-}
-
-void SearchTabHelper::InstantSupportChanged(bool instant_support) {
-  if (!is_search_enabled_)
-    return;
-
-  InstantSupportState new_state = instant_support ? INSTANT_SUPPORT_YES :
-      INSTANT_SUPPORT_NO;
-
-  model_.SetInstantSupportState(new_state);
-
-  content::NavigationEntry* entry =
-      web_contents_->GetController().GetLastCommittedEntry();
-  if (entry) {
-    search::SetInstantSupportStateInNavigationEntry(new_state, entry);
-    if (delegate_ && !instant_support)
-      delegate_->OnWebContentsInstantSupportDisabled(web_contents_);
-  }
+  UpdateMode(false);
 }
 
 bool SearchTabHelper::SupportsInstant() const {
   return model_.instant_support() == INSTANT_SUPPORT_YES;
 }
 
 void SearchTabHelper::SetSuggestionToPrefetch(
     const InstantSuggestion& suggestion) {
   ipc_router_.SetSuggestionToPrefetch(suggestion);
 }
@@ skipping 88 matching lines @@
   if (!is_search_enabled_)
     return;
 
   if (!load_details.is_main_frame)
     return;
 
   if (search::ShouldAssignURLToInstantRenderer(web_contents_->GetURL(),
                                                profile()))
     ipc_router_.SetDisplayInstantResults();
 
-  UpdateMode(true, false);
+  UpdateMode(true);
 
   content::NavigationEntry* entry =
       web_contents_->GetController().GetVisibleEntry();
   DCHECK(entry);
 
   // Already determined the instant support state for this page, do not reset
   // the instant support state.
   if (load_details.is_in_page) {
     // When an "in-page" navigation happens, we will not receive a
     // DidFinishLoad() event. Therefore, we will not determine the Instant
@@ skipping 148 matching lines @@
                             manager->GetAuthenticatedAccountInfo().email));
   } else {
     ipc_router_.SendChromeIdentityCheckResult(identity, false);
   }
 }
 
 void SearchTabHelper::OnHistorySyncCheck() {
   ipc_router_.SendHistorySyncCheckResult(IsHistorySyncEnabled(profile()));
 }
 
-void SearchTabHelper::UpdateMode(bool update_origin, bool is_preloaded_ntp) {
+void SearchTabHelper::InstantSupportChanged(bool instant_support) {
+  if (!is_search_enabled_)
+    return;
+
+  InstantSupportState new_state = instant_support ? INSTANT_SUPPORT_YES :
+      INSTANT_SUPPORT_NO;
+
+  model_.SetInstantSupportState(new_state);
+
+  content::NavigationEntry* entry =
+      web_contents_->GetController().GetLastCommittedEntry();
+  if (entry) {
+    search::SetInstantSupportStateInNavigationEntry(new_state, entry);
+    if (delegate_ && !instant_support)
+      delegate_->OnWebContentsInstantSupportDisabled(web_contents_);
+  }
+}
+
+void SearchTabHelper::UpdateMode(bool update_origin) {
   SearchMode::Type type = SearchMode::MODE_DEFAULT;
   SearchMode::Origin origin = SearchMode::ORIGIN_DEFAULT;
-  if (IsNTP(web_contents_) || is_preloaded_ntp) {
+  if (IsNTP(web_contents_)) {
     type = SearchMode::MODE_NTP;
     origin = SearchMode::ORIGIN_NTP;
   } else if (IsSearchResults(web_contents_)) {
     type = SearchMode::MODE_SEARCH_RESULTS;
     origin = SearchMode::ORIGIN_SEARCH;
   }
   if (!update_origin)
     origin = model_.mode().origin;
 
   OmniboxView* omnibox = GetOmniboxView();
@@ skipping 28 matching lines @@
 
 bool SearchTabHelper::IsInputInProgress() const {
   OmniboxView* omnibox = GetOmniboxView();
   return !model_.mode().is_ntp() && omnibox &&
       omnibox->model()->focus_state() == OMNIBOX_FOCUS_VISIBLE;
 }
 
 OmniboxView* SearchTabHelper::GetOmniboxView() const {
   return delegate_ ? delegate_->GetOmniboxView() : NULL;
 }