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

Unified Diff: ui/views/controls/button/menu_button.h

Issue 10437006: Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 years, 7 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/views/controls/button/menu_button.h
diff --git a/ui/views/controls/button/menu_button.h b/ui/views/controls/button/menu_button.h
index d37044bdbb062d59b4cfa2eff3161ab1cc9c6505..58f14f3941bf2ae31b6f5f7dc22143add316617b 100644
--- a/ui/views/controls/button/menu_button.h
+++ b/ui/views/controls/button/menu_button.h
@@ -38,7 +38,7 @@ class VIEWS_EXPORT MenuButton : public TextButton {
bool show_menu_marker);
virtual ~MenuButton();
- void set_menu_marker(const SkBitmap* menu_marker) {
+ void set_menu_marker(const gfx::ImageSkia* menu_marker) {
menu_marker_ = menu_marker;
}
@@ -91,7 +91,7 @@ class VIEWS_EXPORT MenuButton : public TextButton {
// The down arrow used to differentiate the menu button from normal
// text buttons.
- const SkBitmap* menu_marker_;
+ const gfx::ImageSkia* menu_marker_;
// If non-null the destuctor sets this to true. This is set while the menu is
// showing and used to detect if the menu was deleted while running.

Powered by Google App Engine
This is Rietveld 408576698