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

Unified Diff: ui/base/models/menu_model.h

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: ui/base/models/menu_model.h
diff --git a/ui/base/models/menu_model.h b/ui/base/models/menu_model.h
index 7ca33bdb2ce6f272f6b2730c45ddf46d5c31bee0..f7acb1672d78e18974fcbfd84108d7db6c61870d 100644
--- a/ui/base/models/menu_model.h
+++ b/ui/base/models/menu_model.h
@@ -9,12 +9,13 @@
#include "base/string16.h"
#include "ui/base/models/menu_model_delegate.h"
#include "ui/base/ui_export.h"
+#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/native_widget_types.h"
-class SkBitmap;
namespace gfx {
class Font;
+class ImageSkia;
}
namespace ui {
@@ -87,7 +88,7 @@ class UI_EXPORT MenuModel {
// Gets the icon for the item at the specified index, returning true if there
// is an icon, false otherwise.
- virtual bool GetIconAt(int index, SkBitmap* icon) = 0;
+ virtual bool GetIconAt(int index, gfx::ImageSkia* icon) = 0;
// Returns the model for a menu item with a line of buttons at |index|.
virtual ButtonMenuItemModel* GetButtonMenuItemAt(int index) const = 0;

Powered by Google App Engine
This is Rietveld 408576698