Use a placeholder logo image/label in SearchViewController.

chrome/browser/ui/views/search_view_controller.h

Index: chrome/browser/ui/views/search_view_controller.h
diff --git a/chrome/browser/ui/views/search_view_controller.h b/chrome/browser/ui/views/search_view_controller.h
index 70e8d9d810598fdfc79a27d626e03a13e28e986a..a5ae0e9f52b0ffe169aea5034a425b9c7e2086b7 100644
--- a/chrome/browser/ui/views/search_view_controller.h
+++ b/chrome/browser/ui/views/search_view_controller.h
@@ -26,6 +26,8 @@ class WebContents;
 }
 
 namespace views {
+class ImageView;
+class Label;
 class View;
 class WebView;
 }
@@ -38,7 +40,8 @@ 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();
@@ -96,6 +99,9 @@ class SearchViewController
   // |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();
 
@@ -108,6 +114,9 @@ class SearchViewController
   // Access active web contents.
   content::WebContents* web_contents();
 
+  // The profile.  Weak.
+  content::BrowserContext* browser_context_;
+
   // Where the overlay is placed.  Weak.
   ContentsContainer* contents_container_;
 
@@ -150,8 +159,10 @@ class SearchViewController
   //
   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_;