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

Unified Diff: ui/app_list/views/search_box_view.cc

Issue 298813002: views: Move MenuButton from TextButton to LabelButton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable DragDirectlyToSecondWindow. Created 6 years, 6 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: ui/app_list/views/search_box_view.cc
diff --git a/ui/app_list/views/search_box_view.cc b/ui/app_list/views/search_box_view.cc
index a9b65a130b9b8e2921790e95c1b3777bf8f9a7c5..2569942c0c2f76e31edce40a8218a9cd7dafaebd 100644
--- a/ui/app_list/views/search_box_view.cc
+++ b/ui/app_list/views/search_box_view.cc
@@ -16,6 +16,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/events/event.h"
+#include "ui/views/border.h"
#include "ui/views/controls/button/image_button.h"
#include "ui/views/controls/button/menu_button.h"
#include "ui/views/controls/image_view.h"
@@ -57,10 +58,12 @@ SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate,
#if !defined(OS_CHROMEOS)
menu_button_ = new views::MenuButton(NULL, base::string16(), this, false);
menu_button_->SetBorder(views::Border::NullBorder());
- menu_button_->SetIcon(*rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_NORMAL));
- menu_button_->SetHoverIcon(*rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_HOVER));
- menu_button_->SetPushedIcon(*rb.GetImageSkiaNamed(
- IDR_APP_LIST_TOOLS_PRESSED));
+ menu_button_->SetImage(views::Button::STATE_NORMAL,
+ *rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_NORMAL));
+ menu_button_->SetImage(views::Button::STATE_HOVERED,
+ *rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_HOVER));
+ menu_button_->SetImage(views::Button::STATE_PRESSED,
+ *rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_PRESSED));
AddChildView(menu_button_);
#endif
« no previous file with comments | « chrome/browser/ui/views/website_settings/permissions_bubble_view.cc ('k') | ui/message_center/views/notifier_settings_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698