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

chrome/browser/ui/search/instant_page.cc

 // 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.
 
 #include "chrome/browser/ui/search/instant_page.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 
 InstantPage::Delegate::~Delegate() {
 }
 
 InstantPage::~InstantPage() {
 }
 
-bool InstantPage::IsLocalNTP() const {
+bool InstantPage::IsLocal() const {
   return contents() &&
-      contents()->GetURL() == GURL(chrome::kChromeSearchLocalNtpUrl);
-}
-
-bool InstantPage::IsLocalOverlay() const {
-  return contents() &&
-      contents()->GetURL() == GURL(chrome::kChromeSearchLocalOmniboxPopupURL);
+      (contents()->GetURL() == GURL(chrome::kChromeSearchLocalNtpUrl) ||
+       contents()->GetURL() == GURL(chrome::kChromeSearchLocalGoogleNtpUrl));
 }
 
 void InstantPage::Update(const string16& text,
                          size_t selection_start,
                          size_t selection_end,
                          bool verbatim) {
   Send(new ChromeViewMsg_SearchBoxChange(routing_id(), text, verbatim,
                                          selection_start, selection_end));
 }
 
@@ skipping 216 matching lines @@
   delegate_->DeleteMostVisitedItem(restricted_id);
 }
 
 void InstantPage::OnUndoMostVisitedDeletion(InstantRestrictedID restricted_id) {
   delegate_->UndoMostVisitedDeletion(restricted_id);
 }
 
 void InstantPage::OnUndoAllMostVisitedDeletions() {
   delegate_->UndoAllMostVisitedDeletions();
 }