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

chrome/browser/search/search.cc

 // 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.
 
 #include "chrome/browser/search/search.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
+#include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 
@@ skipping 302 matching lines @@
 
 bool NavEntryIsInstantNTP(const content::WebContents* contents,
                           const content::NavigationEntry* entry) {
   if (!contents || !entry)
     return false;
 
   Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
   return IsInstantExtendedAPIEnabled() &&
          IsRenderedInInstantProcess(contents, profile) &&
          (IsInstantURL(entry->GetVirtualURL(), profile) ||
-          entry->GetVirtualURL() == GURL(chrome::kChromeSearchLocalNtpUrl)) &&
+          entry->GetVirtualURL() == GetLocalInstantURL(profile)) &&
          GetSearchTermsImpl(contents, entry).empty();
 }
 
 bool ShouldAssignURLToInstantRenderer(const GURL& url, Profile* profile) {
   return url.is_valid() &&
          profile &&
          (url.SchemeIs(chrome::kChromeSearchScheme) ||
           IsInstantURL(url, profile));
 }
 
@@ skipping 110 matching lines @@
       const std::string secure_scheme = chrome::kHttpsScheme;
       GURL::Replacements replacements;
       replacements.SetSchemeStr(secure_scheme);
       instant_url = instant_url.ReplaceComponents(replacements);
     }
   }
 
   return instant_url;
 }
 
+GURL GetLocalInstantURL(Profile* profile) {
+  const TemplateURL* default_provider =
+      TemplateURLServiceFactory::GetForProfile(profile)->
+      GetDefaultSearchProvider();
+
+  if (default_provider &&
+      (TemplateURLPrepopulateData::GetEngineType(default_provider->url()) ==
+       SEARCH_ENGINE_GOOGLE)) {
+    return GURL(chrome::kChromeSearchLocalGoogleNtpUrl);
+  }
+  return GURL(chrome::kChromeSearchLocalNtpUrl);
+}
+
 bool IsInstantEnabled(Profile* profile) {
   return GetInstantURL(profile, kDisableStartMargin).is_valid();
 }
 
 bool IsAggressiveLocalNTPFallbackEnabled() {
   // Check the command-line/about:flags setting first, which should have
   // precedence and allows the trial to not be reported (if it's never queried).
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kDisableInstantExtendedAPI) ||
       command_line->HasSwitch(switches::kEnableInstantExtendedAPI)) {
@@ skipping 119 matching lines @@
   replacements.SetHostStr(search_host);
   replacements.SetPortStr(search_port);
   return instant_url.ReplaceComponents(replacements);
 }
 
 bool MatchesOriginAndPath(const GURL& my_url, const GURL& other_url) {
   return MatchesOrigin(my_url, other_url) && my_url.path() == other_url.path();
 }
 
 }  // namespace chrome