InstantExtended: Add js api for custom 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 231 matching lines @@
     : browser_context_(browser_context),
       contents_container_(contents_container),
       toolbar_search_animator_(toolbar_search_animator),
       toolbar_view_(toolbar_view),
       location_bar_container_(NULL),
       state_(STATE_NOT_VISIBLE),
       tab_contents_(NULL),
       search_container_(NULL),
       ntp_container_(NULL),
       content_view_(NULL),
-      omnibox_popup_parent_(NULL) {
+      omnibox_popup_parent_(NULL),
+      instant_has_custom_logo_(false) {
   omnibox_popup_parent_ = new internal::OmniboxPopupContainer(this);
 }
 
 SearchViewController::~SearchViewController() {
   if (search_model())
     search_model()->RemoveObserver(this);
 
   // If the |omnibox_popup_view_| isn't parented, delete it. Otherwise it'll be
   // deleted by its parent.
   if (!omnibox_popup_parent_->parent())
@@ skipping 69 matching lines @@
   int omnibox_x = (ntp_container_->bounds().width() - omnibox_width) / 2;
   gfx::Point omnibox_origin(omnibox_x,
                             GetLogoView()->bounds().bottom() +
                                 chrome::search::kLogoBottomGap);
   views::View::ConvertPointToTarget(ntp_container_, destination,
                                     &omnibox_origin);
   return gfx::Rect(omnibox_origin.x(), omnibox_origin.y(),
                    omnibox_width, chrome::search::kNTPOmniboxHeight);
 }
 
+void SearchViewController::SetInstantHasCustomLogo(bool has_logo) {
+  instant_has_custom_logo_ = has_logo;
+}
+
 void SearchViewController::OnImplicitAnimationsCompleted() {
   DCHECK_EQ(STATE_NTP_ANIMATING, state_);
   state_ = STATE_SUGGESTIONS;
   ntp_container_->SetVisible(false);
   MaybeHideOverlay();
   // While |ntp_container_| was fading out, location bar was animating from the
   // middle of the NTP page to the top toolbar, at the same rate.
   // Suggestions need to be aligned with the final location of the location bar.
   // So if omnibox popup view (InlineOmniboxPopupView) is visible, force a
   // re-layout of its children (i.e. the suggestions) to align with the location
@@ skipping 141 matching lines @@
   ntp_container_->layer()->SetMasksToBounds(true);
 
   const TemplateURL* default_provider =
       TemplateURLServiceFactory::GetForProfile(
           Profile::FromBrowserContext(browser_context_))->
               GetDefaultSearchProvider();
 
   if (default_provider &&
       InstantUI::ShouldShowSearchProviderLogo(browser_context_) &&
       (TemplateURLPrepopulateData::GetEngineType(default_provider->url()) ==
-       SEARCH_ENGINE_GOOGLE)) {
+       SEARCH_ENGINE_GOOGLE) &&
+      !instant_has_custom_logo_) {
     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);
   }
 
   if (!default_provider_logo_.get()) {
     default_provider_name_.reset(new views::Label(
-        default_provider ? default_provider->short_name() : string16()));
+        default_provider && !instant_has_custom_logo_ ?
+            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));
-    default_provider_name_->SetEnabledColor(SK_ColorRED);
+    if (!instant_has_custom_logo_) {
+      default_provider_name_->set_background(
+          views::Background::CreateSolidBackground(SK_ColorRED));
+      default_provider_name_->SetEnabledColor(SK_ColorRED);
+    }
     default_provider_name_->SetFont(
         default_provider_name_->font().DeriveFont(75, gfx::Font::BOLD));
     default_provider_name_->SetPaintToLayer(true);
     default_provider_name_->SetFillsBoundsOpaquely(false);
   }
 
   // Reparent the main web contents view out of |contents_container_| and
   // in to |ntp_container_| below.  Reparent back in destructor.
   content_view_ = contents_container_->active();
   DCHECK(content_view_);
@@ skipping 94 matching lines @@
 
 chrome::search::SearchModel* SearchViewController::search_model() {
   return tab_contents_ ? chrome::search::SearchTabHelper::FromWebContents(
                              tab_contents_->web_contents())->model()
                        : NULL;
 }
 
 content::WebContents* SearchViewController::web_contents() {
   return tab_contents_ ? tab_contents_->web_contents() : NULL;
 }