diff options
Diffstat (limited to 'chrome/browser/chromeos')
| -rw-r--r-- | chrome/browser/chromeos/login/helper.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/chromeos/status/network_menu.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc index 439ccbb..7fd1bf39 100644 --- a/chrome/browser/chromeos/login/helper.cc +++ b/chrome/browser/chromeos/login/helper.cc @@ -41,7 +41,7 @@ views::SmoothedThrobber* CreateDefaultSmoothedThrobber() { views::SmoothedThrobber* throbber = new views::SmoothedThrobber(kThrobberFrameMs); throbber->SetFrames( - ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_SPINNER)); + ResourceBundle::GetSharedInstance().GetImageSkiaNamed(IDR_SPINNER)); throbber->set_start_delay_ms(kThrobberStartDelayMs); return throbber; } @@ -49,7 +49,7 @@ views::SmoothedThrobber* CreateDefaultSmoothedThrobber() { views::Throbber* CreateDefaultThrobber() { views::Throbber* throbber = new views::Throbber(kThrobberFrameMs, false); throbber->SetFrames( - ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_SPINNER)); + ResourceBundle::GetSharedInstance().GetImageSkiaNamed(IDR_SPINNER)); return throbber; } diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc index af8b182..1b5ce7b 100644 --- a/chrome/browser/chromeos/status/network_menu.cc +++ b/chrome/browser/chromeos/status/network_menu.cc @@ -174,7 +174,7 @@ class NetworkMenuModel : public ui::MenuModel { ui::Accelerator* accelerator) const OVERRIDE; virtual bool IsItemCheckedAt(int index) const OVERRIDE; virtual int GetGroupIdAt(int index) const OVERRIDE; - virtual bool GetIconAt(int index, SkBitmap* icon) OVERRIDE; + virtual bool GetIconAt(int index, gfx::ImageSkia* icon) OVERRIDE; virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt( int index) const OVERRIDE; virtual bool IsEnabledAt(int index) const OVERRIDE; @@ -469,7 +469,7 @@ int NetworkMenuModel::GetGroupIdAt(int index) const { return 0; } -bool NetworkMenuModel::GetIconAt(int index, SkBitmap* icon) { +bool NetworkMenuModel::GetIconAt(int index, gfx::ImageSkia* icon) { if (!menu_items_[index].icon.empty()) { *icon = menu_items_[index].icon; return true; |
