Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8370)

Unified Diff: chrome/browser/ui/views/search_view_controller.h

Issue 10854173: Use a placeholder logo image/label in SearchViewController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and merge. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..afaefe79c86660bc8b232a073bf9ffceb87d9a21 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;
}
@@ -96,6 +98,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();
@@ -150,8 +155,8 @@ class SearchViewController
//
views::View* search_container_;
views::View* ntp_view_;
- views::View* logo_view_;
-
+ views::Label* logo_label_;
+ views::ImageView* logo_image_;
// An alias to |contents_container_->active()|, but reparented within
// |ntp_view_| when in the NTP state.
views::WebView* content_view_;

Powered by Google App Engine
This is Rietveld 408576698