diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-03 15:51:02 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-03 15:51:02 +0000 |
| commit | 7f1f176af553d28ce1afff83bdb3c9629663a59e (patch) | |
| tree | 0015da408df7f373ea31a96b8ab47b53c5524116 /chrome/browser/status_icons/status_tray_unittest.cc | |
| parent | e76cc53b875446d2cd2d1454d838b35fc9680f6f (diff) | |
| download | chromium_src-7f1f176af553d28ce1afff83bdb3c9629663a59e.zip chromium_src-7f1f176af553d28ce1afff83bdb3c9629663a59e.tar.gz chromium_src-7f1f176af553d28ce1afff83bdb3c9629663a59e.tar.bz2 | |
status_icons: Update StatusTray/StatusIcon to use ImageSkia.
StatusTray/StatusIcon (in chrome/browser/status_icons) needs to use ImageSkia
instead of SkBitmap.
Note: These are not used on mac or chromeos (these are different from the ash
status-tray stuff).
BUG=143104
R=pkotwicz@chromium.org,atwilson@chromium.org
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/11032024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/status_icons/status_tray_unittest.cc')
| -rw-r--r-- | chrome/browser/status_icons/status_tray_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/status_icons/status_tray_unittest.cc b/chrome/browser/status_icons/status_tray_unittest.cc index 3983dbe..51d38b4 100644 --- a/chrome/browser/status_icons/status_tray_unittest.cc +++ b/chrome/browser/status_icons/status_tray_unittest.cc @@ -13,10 +13,10 @@ using testing::Return; class MockStatusIcon : public StatusIcon { - virtual void SetImage(const SkBitmap& image) OVERRIDE {} - virtual void SetPressedImage(const SkBitmap& image) OVERRIDE {} + virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE {} + virtual void SetPressedImage(const gfx::ImageSkia& image) OVERRIDE {} virtual void SetToolTip(const string16& tool_tip) OVERRIDE {} - virtual void DisplayBalloon(const SkBitmap& icon, + virtual void DisplayBalloon(const gfx::ImageSkia& icon, const string16& title, const string16& contents) OVERRIDE {} virtual void UpdatePlatformContextMenu(ui::MenuModel* menu) OVERRIDE {} |