InstantExtended: don't preload the local NTP.

chrome/browser/ui/search/instant_controller.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_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 136 matching lines @@
   void SearchModeChanged(const SearchMode& old_mode,
                          const SearchMode& new_mode);
 
   // The user switched tabs. Hide the overlay. Create |instant_tab_| if the
   // newly active tab is an Instant search results page.
   void ActiveTabChanged();
 
   // The user is about to switch tabs. Commit the overlay if needed.
   void TabDeactivated(content::WebContents* contents);
 
-  // Sets whether Instant should show result overlays. |use_local_overlay_only|
-  // will force the use of kLocalOmniboxPopupURL as the Instant URL and is only
+  // Sets whether Instant should show result overlays. |use_local_page_only|
+  // will force the use of baked-in page as the Instant URL and is only
   // applicable if |extended_enabled_| is true.
-  void SetInstantEnabled(bool instant_enabled, bool use_local_overlay_only);
+  void SetInstantEnabled(bool instant_enabled, bool use_local_page_only);
 
   // The theme has changed. Pass the message to the overlay page.
   void ThemeChanged(const ThemeBackgroundInfo& theme_info);
 
   // Called when someone else swapped in a different contents in the |overlay_|.
   void SwappedOverlayContents();
 
   // Called when contents for |overlay_| received focus.
   void FocusedOverlayContents();
 
@@ skipping 45 matching lines @@
                            MiddleClickOnSuggestionOpensInNewTab);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, NTPIsPreloaded);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInNewTab);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInSameTab);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPForWrongProvider);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UnrelatedSiteInstance);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ValidatesSuggestions);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
                            OmniboxCommitsWhenShownFullHeight);
-  FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, LocalNTPIsNotLocalOverlay);
+  FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, LocalNTPIsNotPreloaded);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedManualTest,
                            MANUAL_OmniboxFocusLoadsInstant);
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Overridden from InstantPage::Delegate:
   // TODO(shishir): We assume that the WebContent's current RenderViewHost is
@@ skipping 133 matching lines @@
   bool ShouldSwitchToLocalNTP() const;
 
   BrowserInstantController* const browser_;
 
   // Whether the extended API and regular API are enabled. If both are false,
   // Instant is effectively disabled.
   const bool extended_enabled_;
   bool instant_enabled_;
 
   // If true, the Instant URL is set to kLocalOmniboxPopupURL.
-  bool use_local_overlay_only_;
+  bool use_local_page_only_;
 
   // The state of the overlay page, i.e., the page owned by |overlay_|. Ignored
   // if |instant_tab_| is in use.
   InstantOverlayModel model_;
 
   // The three instances of InstantPage maintained by InstantController as
   // described above. All three may be non-NULL in extended mode.  If
   // |instant_tab_| is not NULL, then |overlay_| is guaranteed to be hidden and
   // messages will be sent to |instant_tab_| instead.
   //
@@ skipping 79 matching lines @@
   // Used for Top Sites async retrieval.
   base::WeakPtrFactory<InstantController> weak_ptr_factory_;
 
   // Used to get notifications about Most Visted changes.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_