summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorkuan@chromium.org <kuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-22 12:56:47 +0000
committerkuan@chromium.org <kuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-22 12:56:47 +0000
commit512fb63473f240681f41db64de547227c6348a5e (patch)
treeb2c827f3185e0c026e3848a8c7ebe25f690f65f9 /views
parent8543761e279a84484fb41bd272848a81c875565a (diff)
downloadchromium_src-512fb63473f240681f41db64de547227c6348a5e.zip
chromium_src-512fb63473f240681f41db64de547227c6348a5e.tar.gz
chromium_src-512fb63473f240681f41db64de547227c6348a5e.tar.bz2
tweak translate infobar ui
- remove button from options menu and only show it on hover - allow MenuButton to be created with or without border for normal state - make font size and color of all labels, buttons and dropdowns black and medium font respectively - extract creation of label into private function to reduce code - use new special image for all menu drop arrows - modify base class MenuButton's menu_marker_ image to a non-const and allow it to be set BUG=38296 TEST=verify per bug report. Review URL: http://codereview.chromium.org/1150002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42210 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/controls/button/menu_button.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/views/controls/button/menu_button.h b/views/controls/button/menu_button.h
index 9c27798..57f42a0 100644
--- a/views/controls/button/menu_button.h
+++ b/views/controls/button/menu_button.h
@@ -42,6 +42,10 @@ class MenuButton : public TextButton {
menu_delegate_ = delegate;
}
+ void set_menu_marker(const SkBitmap* menu_marker) {
+ menu_marker_ = menu_marker;
+ }
+
// Activate the button (called when the button is pressed).
virtual bool Activate();
@@ -91,7 +95,7 @@ class MenuButton : public TextButton {
// The down arrow used to differentiate the menu button from normal
// text buttons.
- const SkBitmap* const menu_marker_;
+ const SkBitmap* menu_marker_;
DISALLOW_COPY_AND_ASSIGN(MenuButton);
};