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

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

Issue 10824402: Convert ui::MenuModel to use gfx::Image instead of ImageSkia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another day, another rebase Created 8 years, 4 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 a0acc26eb02459d4e8a0fa60aa4f9fdd9d7562bd..2aa70964944c1687f223a9a8d5709bae2afecb94 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -153,7 +153,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, gfx::ImageSkia* icon) OVERRIDE;
+ virtual bool GetIconAt(int index, gfx::Image* icon) OVERRIDE;
virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(
int index) const OVERRIDE;
virtual bool IsEnabledAt(int index) const OVERRIDE;
@@ -376,9 +376,9 @@ int NetworkMenuModel::GetGroupIdAt(int index) const {
return 0;
}
-bool NetworkMenuModel::GetIconAt(int index, gfx::ImageSkia* icon) {
+bool NetworkMenuModel::GetIconAt(int index, gfx::Image* icon) {
if (!menu_items_[index].icon.isNull()) {
- *icon = menu_items_[index].icon;
+ *icon = gfx::Image(menu_items_[index].icon);
return true;
}
return false;
« no previous file with comments | « chrome/browser/background/background_mode_manager.cc ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698