summaryrefslogtreecommitdiffstats
path: root/chrome/browser/status_icons
diff options
context:
space:
mode:
authoratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-10 21:44:41 +0000
committeratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-10 21:44:41 +0000
commit595c64daedc4001c93691088c6d7cc76122ef639 (patch)
treed6b47f33adb478ae64a11cae699eec548d70d9a5 /chrome/browser/status_icons
parent6d2464543977cd709ae1108f958dee5d2c09667b (diff)
downloadchromium_src-595c64daedc4001c93691088c6d7cc76122ef639.zip
chromium_src-595c64daedc4001c93691088c6d7cc76122ef639.tar.gz
chromium_src-595c64daedc4001c93691088c6d7cc76122ef639.tar.bz2
Added monochrome status icons for the mac.
Added support for setting an alternate "pressed" image for status icons. BUG=37375 TEST=updated unit tests Review URL: http://codereview.chromium.org/752002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/status_icons')
-rw-r--r--chrome/browser/status_icons/status_icon.h3
-rw-r--r--chrome/browser/status_icons/status_tray_manager.cc3
-rw-r--r--chrome/browser/status_icons/status_tray_unittest.cc1
3 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/status_icons/status_icon.h b/chrome/browser/status_icons/status_icon.h
index aeefdfe..a2bc089 100644
--- a/chrome/browser/status_icons/status_icon.h
+++ b/chrome/browser/status_icons/status_icon.h
@@ -19,6 +19,9 @@ class StatusIcon {
// Sets the image associated with this status icon.
virtual void SetImage(const SkBitmap& image) = 0;
+ // Sets the image associated with this status icon when pressed.
+ virtual void SetPressedImage(const SkBitmap& image) = 0;
+
// Sets the hover text for this status icon.
virtual void SetToolTip(const string16& tool_tip) = 0;
diff --git a/chrome/browser/status_icons/status_tray_manager.cc b/chrome/browser/status_icons/status_tray_manager.cc
index 26d0840..f0ef268 100644
--- a/chrome/browser/status_icons/status_tray_manager.cc
+++ b/chrome/browser/status_icons/status_tray_manager.cc
@@ -44,7 +44,10 @@ void StatusTrayManager::Init(Profile* profile) {
// Create an icon and add ourselves as a click observer on it
SkBitmap* bitmap = ResourceBundle::GetSharedInstance().GetBitmapNamed(
IDR_STATUS_TRAY_ICON);
+ SkBitmap* pressed = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+ IDR_STATUS_TRAY_ICON_PRESSED);
icon->SetImage(*bitmap);
+ icon->SetPressedImage(*pressed);
icon->AddObserver(this);
}
}
diff --git a/chrome/browser/status_icons/status_tray_unittest.cc b/chrome/browser/status_icons/status_tray_unittest.cc
index 01f9c30..e224fac 100644
--- a/chrome/browser/status_icons/status_tray_unittest.cc
+++ b/chrome/browser/status_icons/status_tray_unittest.cc
@@ -12,6 +12,7 @@ using testing::Return;
class MockStatusIcon : public StatusIcon {
virtual void SetImage(const SkBitmap& image) {}
+ virtual void SetPressedImage(const SkBitmap& image) {}
virtual void SetToolTip(const string16& tool_tip) {}
virtual void AddObserver(StatusIcon::StatusIconObserver* observer) {}
virtual void RemoveObserver(StatusIcon::StatusIconObserver* observer) {}