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..2d4346f39518c7178eee1f5aefbd82ac3e1e5a68 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);
+  explicit SearchViewController(content::BrowserContext* browser_context,

[dhollowa, 2012/08/15 22:48:35]

nit: no longer need |explicit|.

[msw, 2012/08/15 23:15:56]

Done.

+                                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,8 @@ class SearchViewController
   //
   views::View* search_container_;
   views::View* ntp_view_;
-  views::View* logo_view_;
-
+  views::Label* logo_label_;

[samarth, 2012/08/15 22:41:04]

It's probably worth adding a comment here explaining the difference between the
two (unless you want to wait to do so until we actually implement them).

[msw, 2012/08/15 23:15:56]

Done.

+  views::ImageView* logo_image_;
   // An alias to |contents_container_->active()|, but reparented within
   // |ntp_view_| when in the NTP state.
   views::WebView* content_view_;