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

chrome/browser/ui/search/instant_page.h

 // Copyright 2013 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_PAGE_H_
 #define CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 90 matching lines @@
   content::WebContents* contents() const { return web_contents(); }
 
   // Returns true if the page is known to support the Instant API. This starts
   // out false, and is set to true whenever we get any message from the page.
   // Once true, it never becomes false (the page isn't expected to drop API
   // support suddenly).
   bool supports_instant() const { return supports_instant_; }
 
   // Returns true if the page is the local NTP (i.e. its URL is
   // chrome::kChromeSearchLocalNTPURL).
-  bool IsLocalNTP() const;
-
-  // Returns true if the page is the local overlay (i.e. its URL is
-  // chrome::kChromeSearchLocalOmniboxPopupURL).
-  bool IsLocalOverlay() const;
+  bool IsLocal() const;
 
   // Tells the page that the user typed |text| into the omnibox. If |verbatim|
   // is false, the page predicts the query the user means to type and fetches
   // results for the prediction. If |verbatim| is true, |text| is taken as the
   // exact query (no prediction is made). |selection_start| and |selection_end|
   // mark the inline autocompleted portion (i.e., blue highlighted text). The
   // omnibox caret (cursor) is at |selection_end|.
   virtual void Update(const string16& text,
                       size_t selection_start,
                       size_t selection_end,
@@ skipping 105 matching lines @@
   void OnUndoMostVisitedDeletion(InstantRestrictedID most_visited_item_id);
   void OnUndoAllMostVisitedDeletions();
 
   Delegate* const delegate_;
   bool supports_instant_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantPage);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_