Use a placeholder logo image/label in SearchViewController.

chrome/browser/ui/views/search_view_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_SEARCH_VIEW_CONTROLLER_H_
 #define CHROME_BROWSER_UI_VIEWS_SEARCH_VIEW_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/ui/search/search_model_observer.h"
 #include "ui/compositor/layer_animation_observer.h"
 
 class ContentsContainer;
 class LocationBarContainer;
 class TabContents;
 
 namespace chrome {
 namespace search {
 class SearchModel;
 }
 }
 
 namespace content {
 class BrowserContext;
 class WebContents;
 }
 
 namespace views {
+class ImageView;
+class Label;
 class View;
 class WebView;
 }
 
 // SearchViewController maintains the search overlay (native new tab page).
 // To avoid ordering dependencies this class listens directly to the
 // SearchModel of the active tab. BrowserView is responsible for telling this
 // class when the active tab changes.
 class SearchViewController
     : public chrome::search::SearchModelObserver,
       public ui::ImplicitAnimationObserver {
  public:
-  explicit SearchViewController(ContentsContainer* contents_container);
+  SearchViewController(content::BrowserContext* browser_context,
+                       ContentsContainer* contents_container);
   virtual ~SearchViewController();
 
   views::View* omnibox_popup_view_parent();
 
   void set_location_bar_container(
       LocationBarContainer* location_bar_container) {
     location_bar_container_ = location_bar_container;
   }
 
   // Sets the active tab.
@@ skipping 37 matching lines @@
   // from the current state of the SearchModel.
   void SetState(State state);
 
   // Starts the animation.
   void StartAnimation();
 
   // Create the various views and installs them as an overlay on
   // |contents_container_|.
   void CreateViews();
 
+  // Return the logo image view, or a label if an image is not available.
+  views::View* GetLogoView() const;
+
   // Destroys the various views.
   void DestroyViews();
 
   // Invoked when the visibility of the omnibox popup changes.
   void PopupVisibilityChanged();
 
   // Access active search model.
   chrome::search::SearchModel* search_model();
 
   // Access active web contents.
   content::WebContents* web_contents();
 
+  // The profile.  Weak.
+  content::BrowserContext* browser_context_;
+
   // Where the overlay is placed.  Weak.
   ContentsContainer* contents_container_;
 
   // Weak.
   LocationBarContainer* location_bar_container_;
 
   State state_;
 
   // The active TabContents.  Weak.  May be NULL.
   TabContents* tab_contents_;
@@ skipping 22 matching lines @@
   // * - the LocationBarContainer gets positioned here, but it is not a child
   // of any of these views.
   //
   // NTPView and OmniboxPopupViewParent are siblings. When on the NTP the
   // OmniboxPopupViewParent is obscured by the NTPView. When on a search page
   // the NTPView is hidden.
   //
   //
   views::View* search_container_;
   views::View* ntp_view_;
-  views::View* logo_view_;
-
+  // The default provider's name label, used if an image is unavailable.

[Peter Kasting, 2012/08/16 03:52:41]

Nit: Might be clearer to write as:

  // The default provider's logo.  May be NULL.
  views::ImageView* default_provider_logo_;
  // The default provider's name.  Used as a fallback when |logo_image_| is
  // NULL.
  views::Label* default_provider_name_;

[msw, 2012/08/16 08:29:08]

Done.

+  views::Label* logo_label_;
+  // The default provider's logo image, used if an image is available.
+  views::ImageView* logo_image_;
   // An alias to |contents_container_->active()|, but reparented within
   // |ntp_view_| when in the NTP state.
   views::WebView* content_view_;
 
   OmniboxPopupViewParent* omnibox_popup_view_parent_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchViewController);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_SEARCH_VIEW_CONTROLLER_H_