Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(499)

Unified Diff: chrome/browser/ui/views/search_view_controller.cc

Issue 10910286: alternate ntp: show search provider logo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased, merged conflicts Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/instant/instant.js ('k') | chrome/browser/ui/webui/instant_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/search_view_controller.cc
diff --git a/chrome/browser/ui/views/search_view_controller.cc b/chrome/browser/ui/views/search_view_controller.cc
index 92715874c0a6315f2bfd2a653b11c48f5b9a4ce8..3a3111e8261ac8cf25b47a048206114e22e4490c 100644
--- a/chrome/browser/ui/views/search_view_controller.cc
+++ b/chrome/browser/ui/views/search_view_controller.cc
@@ -475,8 +475,7 @@ void SearchViewController::CreateViews(State state) {
Profile::FromBrowserContext(browser_context_))->
GetDefaultSearchProvider();
-#if defined(GOOGLE_CHROME_BUILD)
- if (default_provider &&
+ if (default_provider && InstantUI::ShouldShowSearchProviderLogo() &&
(TemplateURLPrepopulateData::GetEngineType(default_provider->url()) ==
SEARCH_ENGINE_GOOGLE)) {
default_provider_logo_.reset(new views::ImageView());
@@ -486,7 +485,6 @@ void SearchViewController::CreateViews(State state) {
default_provider_logo_->SetPaintToLayer(true);
default_provider_logo_->SetFillsBoundsOpaquely(false);
}
-#endif
if (!default_provider_logo_.get()) {
default_provider_name_.reset(new views::Label(
« no previous file with comments | « chrome/browser/resources/instant/instant.js ('k') | chrome/browser/ui/webui/instant_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698