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

chrome/common/url_constants.cc

 // Copyright (c) 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.
 
 #include "chrome/common/url_constants.h"
 
 #include "googleurl/src/url_util.h"
 
 namespace chrome {
 
@@ skipping 494 matching lines @@
 };
 const int kNumberOfChromeDebugURLs =
     static_cast<int>(arraysize(kChromeDebugURLs));
 
 const char kExtensionResourceScheme[] = "chrome-extension-resource";
 
 const char kChromeSearchScheme[] = "chrome-search";
 const char kChromeSearchLocalNtpHost[] = "local-ntp";
 const char kChromeSearchLocalNtpUrl[] =
     "chrome-search://local-ntp/local-ntp.html";
-
-const char kChromeSearchLocalOmniboxPopupHost[] = "local-omnibox-popup";
-const char kChromeSearchLocalOmniboxPopupURL[]
-    = "chrome-search://local-omnibox-popup/local-omnibox-popup.html";
+const char kChromeSearchLocalGoogleNtpUrl[] =
+    "chrome-search://local-ntp/local-ntp.html?isGoogle";
 
 const char kChromeSearchSuggestionHost[] = "suggestion";
 
 // Google SafeSearch query parameters.
 const char kSafeSearchSafeParameter[] = "safe=active";
 const char kSafeSearchSsuiParameter[] = "ssui=on";
 
 const char kMediaAccessLearnMoreUrl[] =
     "https://support.google.com/chrome/?p=ib_access_cam_mic";
 
 }  // namespace chrome