Cleanup in SearchTabHelper

chrome/browser/ui/search/search_tab_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_
 #define CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ skipping 34 matching lines @@
                         public content::WebContentsUserData<SearchTabHelper>,
                         public InstantServiceObserver,
                         public SearchIPCRouter::Delegate {
  public:
   ~SearchTabHelper() override;
 
   SearchModel* model() {
     return &model_;
   }
 
-  // Sets up the initial state correctly for a preloaded NTP.
-  void InitForPreloadedNTP();
-
   // Invoked when the omnibox input state is changed in some way that might
   // affect the search mode.
   void OmniboxInputStateChanged();
 
   // Called to indicate that the omnibox focus state changed with the given
   // |reason|.
   void OmniboxFocusChanged(OmniboxFocusState state,
                            OmniboxFocusChangeReason reason);
 
   // Invoked when the active navigation entry is updated in some way that might
   // affect the search mode. This is used by Instant when it "fixes up" the
   // virtual URL of the active entry. Regular navigations are captured through
   // the notification system and shouldn't call this method.
   void NavigationEntryUpdated();
 
-  // Invoked to update the instant support state.
-  void InstantSupportChanged(bool supports_instant);
-
   // Returns true if the page supports instant. If the instant support state is
   // not determined or if the page does not support instant returns false.
   bool SupportsInstant() const;
 
   // Sends the current SearchProvider suggestion to the Instant page if any.
   void SetSuggestionToPrefetch(const InstantSuggestion& suggestion);
 
   // Tells the page that the user pressed Enter in the omnibox.
   void Submit(const base::string16& text,
               const EmbeddedSearchRequestParams& params);
@@ skipping 84 matching lines @@
                                   NTPLoggingTileSource tile_source) override;
   void PasteIntoOmnibox(const base::string16& text) override;
   void OnChromeIdentityCheck(const base::string16& identity) override;
   void OnHistorySyncCheck() override;
 
   // Overridden from InstantServiceObserver:
   void ThemeInfoChanged(const ThemeBackgroundInfo& theme_info) override;
   void MostVisitedItemsChanged(
       const std::vector<InstantMostVisitedItem>& items) override;
 
+  // Invoked to update the instant support state.
+  void InstantSupportChanged(bool supports_instant);
+
   // Sets the mode of the model based on the current URL of web_contents().
   // Only updates the origin part of the mode if |update_origin| is true,
-  // otherwise keeps the current origin. If |is_preloaded_ntp| is true, the mode
-  // is set to NTP regardless of the current URL; this is used to ensure that
-  // InstantController can bind InstantTab to new tab pages immediately.
-  void UpdateMode(bool update_origin, bool is_preloaded_ntp);
+  // otherwise keeps the current origin.
+  void UpdateMode(bool update_origin);
 
   // Tells the renderer to determine if the page supports the Instant API, which
   // results in a call to OnInstantSupportDetermined() when the reply is
   // received.
   void DetermineIfPageSupportsInstant();
 
   // Used by unit tests.
   SearchIPCRouter& ipc_router() { return ipc_router_; }
 
   Profile* profile() const;
@@ skipping 28 matching lines @@
   SearchTabHelperDelegate* delegate_;
 
   // Function to check if the omnibox has focus. Tests use this to modify the
   // default behavior.
   OmniboxHasFocusFn omnibox_has_focus_fn_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchTabHelper);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_