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

Index: chrome/browser/ui/search/instant_controller.h
diff --git a/chrome/browser/ui/search/instant_controller.h b/chrome/browser/ui/search/instant_controller.h
index fa3cd642c42c497b975666a945b35f49b2bd5879..43299dd1098f19f377fa047d64057f16e014b42e 100644
--- a/chrome/browser/ui/search/instant_controller.h
+++ b/chrome/browser/ui/search/instant_controller.h
@@ -155,8 +155,8 @@ class InstantController : public InstantPage::Delegate,
   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.
@@ -284,9 +284,9 @@ class InstantController : public InstantPage::Delegate,
 
   // 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
@@ -360,12 +360,6 @@ class InstantController : public InstantPage::Delegate,
   // 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;
 
@@ -376,7 +370,7 @@ class InstantController : public InstantPage::Delegate,
   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