Merge local_omnibox_popup into local_ntp. Render the Google logo and fakebox if Google is the sear…

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 137 matching lines @@
                          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
-  // applicable if |extended_enabled_| is true.
+  // will force the use of kChromeSearchLocalNtpUrl as the Instant URL and is
+  // only applicable if |extended_enabled_| is true.
   void SetInstantEnabled(bool instant_enabled, bool use_local_overlay_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 107 matching lines @@
   // Helper for OmniboxFocusChanged. Commit or discard the overlay.
   void OmniboxLostFocus(gfx::NativeView view_gaining_focus);
 
   // Creates a new NTP, using the instant_url property of the default
   // TemplateURL, or chrome::kChromeSearchLocalNTPURL if |use_local_ntp| is
   // true. For |ignore_blacklist| look at comments in GetInstantURL().
   void ResetNTP(bool ignore_blacklist, bool use_local_ntp);
 
   // Ensures that |overlay_| uses the Instant URL returned by GetInstantURL(),
   // creating a new overlay if necessary. In extended mode, will fallback to
-  // using the kLocalOmniboxPopupURL as the Instant URL in case GetInstantURL()
-  // returns false. Returns true if an Instant URL could be determined.
-  // For |ignore_blacklist| look at comments in GetInstantURL().
+  // using the kChromeSearchLocalNtpUrl as the Instant URL in case
+  // GetInstantURL() returns false. Returns true if an Instant URL could be
+  // determined. For |ignore_blacklist| look at comments in GetInstantURL().
   bool EnsureOverlayIsCurrent(bool ignore_blacklist);
 
   // Recreates the |overlay_| with |instant_url|. Note that |overlay_| is
   // deleted in this call.
   void CreateOverlay(const std::string& instant_url,
                      const content::WebContents* active_tab);
 
   // If the |overlay_| being used is in fallback mode, it will be switched back
   // to the remote overlay if the overlay is not showing and the omnibox does
   // not have focus.
@@ skipping 53 matching lines @@
   // Sends a collection of MostVisitedItems to the renderer process via
   // the appropriate InstantPage subclass.
   void SendMostVisitedItems(
       const std::vector<InstantMostVisitedItemIDPair>& items);
 
   // If possible, tries to mutate |suggestion| to a valid suggestion. Returns
   // true if successful. (Note that |suggestion| may be modified even if this
   // returns false.)
   bool FixSuggestion(InstantSuggestion* suggestion) const;
 
-  // Returns true if we should use |instant_tab_| instead of |overlay_| for
-  // handling suggestions.
-  // TODO(samarth|sreeram): this is brittle. Instead, we should probably just
-  // combine the two local pages into one.
-  bool UseInstantTabToShowSuggestions() const;
-
   // Returns true if we should switch to using the local NTP.
   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.
+  // If true, the Instant URL is set to kChromeSearchLocalNtpUrl.
   bool use_local_overlay_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 80 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_