alternate ntp: show search provider logo

chrome/browser/ui/views/search_view_controller.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/browser/ui/views/search_view_controller.h"
 
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/search_engine_type.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 457 matching lines @@
   ntp_container_ = new views::View;
   ntp_container_->set_background(new NTPViewBackground);
   ntp_container_->SetPaintToLayer(true);
   ntp_container_->layer()->SetMasksToBounds(true);
 
   const TemplateURL* default_provider =
       TemplateURLServiceFactory::GetForProfile(
           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());
     default_provider_logo_->set_owned_by_client();
     default_provider_logo_->SetImage(ui::ResourceBundle::GetSharedInstance().
                                          GetImageSkiaNamed(IDR_GOOGLE_LOGO_LG));
     default_provider_logo_->SetPaintToLayer(true);
     default_provider_logo_->SetFillsBoundsOpaquely(false);
   }
-#endif
 
   if (!default_provider_logo_.get()) {
     default_provider_name_.reset(new views::Label(
         default_provider ? default_provider->short_name() : string16()));
     default_provider_name_->set_owned_by_client();
     // TODO(msw): Use a transparent background color as a workaround to support
     // using Labels' view layers via gfx::Canvas::NO_SUBPIXEL_RENDERING.
     default_provider_name_->SetBackgroundColor(0x00000000);
     default_provider_name_->set_background(
         views::Background::CreateSolidBackground(SK_ColorRED));
@@ skipping 102 matching lines @@
           Profile::FromBrowserContext(browser_context_)));
 }
 
 chrome::search::SearchModel* SearchViewController::search_model() {
   return tab_contents_ ? tab_contents_->search_tab_helper()->model() : NULL;
 }
 
 content::WebContents* SearchViewController::web_contents() {
   return tab_contents_ ? tab_contents_->web_contents() : NULL;
 }