Index: chrome/browser/chromeos/status/status_area_button.h |
diff --git a/chrome/browser/chromeos/status/status_area_button.h b/chrome/browser/chromeos/status/status_area_button.h |
index f250bba8e0ecbb603b38deb956e55e232ad1495b..9f2f4d85089b0f4c9a7ffa905b059c9cac4b4941 100644 |
--- a/chrome/browser/chromeos/status/status_area_button.h |
+++ b/chrome/browser/chromeos/status/status_area_button.h |
@@ -8,23 +8,20 @@ |
#include "base/compiler_specific.h" |
#include "base/string16.h" |
+#include "ui/gfx/font.h" |
#include "ui/views/controls/button/menu_button.h" |
#include "ui/views/controls/menu/view_menu_delegate.h" |
-namespace gfx { |
-class Font; |
-} |
- |
// Button to be used to represent status and allow menus to be popped up. |
// Shows current button state by drawing a border around the current icon. |
class StatusAreaButton : public views::MenuButton { |
public: |
// Different text styles for different types of backgrounds. |
enum TextStyle { |
- WHITE_PLAIN, |
- GRAY_PLAIN, |
- WHITE_HALOED, |
- GRAY_EMBOSSED |
+ WHITE_PLAIN_BOLD, |
+ GRAY_PLAIN_LIGHT, |
+ WHITE_HALOED_BOLD, |
+ GRAY_EMBOSSED_BOLD |
}; |
class Delegate { |
@@ -43,9 +40,8 @@ class StatusAreaButton : public views::MenuButton { |
virtual void ExecuteStatusAreaCommand( |
const views::View* button_view, int command_id) = 0; |
- // Return the button font. |font| is set to the default button font. |
- virtual gfx::Font GetStatusAreaFont(const gfx::Font& font) const = 0; |
- |
+ // Get the style that should currently be used in rendering the button's |
+ // text. |
virtual TextStyle GetStatusAreaTextStyle() const = 0; |
// Handle visibility changes (e.g. resize the status area). |
@@ -106,6 +102,10 @@ class StatusAreaButton : public views::MenuButton { |
private: |
Delegate* delegate_; |
+ // Fonts used to render the button's text. |
+ gfx::Font light_font_; |
+ gfx::Font bold_font_; |
+ |
DISALLOW_COPY_AND_ASSIGN(StatusAreaButton); |
}; |