Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(683)

Unified Diff: chrome/browser/chromeos/status/network_menu.cc

Issue 10437006: Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/status/network_menu.cc
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index af8b182ed350d12c40907bde699c2808f32573ec..1b5ce7bea01c69a941360937b308f4336e437a5e 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;

Powered by Google App Engine
This is Rietveld 408576698