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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/image/image_skia.h

Issue 10834382: mac: Remove implicit conversion from ImageSkia to SkBitmap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « skia/ext/skia_utils_mac.mm ('k') | ui/gfx/image/image_skia_unittest.cc » ('j') | ui/gfx/image/image_skia_util_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image_skia.h
diff --git a/ui/gfx/image/image_skia.h b/ui/gfx/image/image_skia.h
index 7c729cb95b0205ce960c5a13b2cdf6b3839e8808..259a71e1b246470ecab115f4214ec3778196b60e 100644
--- a/ui/gfx/image/image_skia.h
+++ b/ui/gfx/image/image_skia.h
@@ -60,7 +60,7 @@ class UI_EXPORT ImageSkia {
// done.
ImageSkia& operator=(const SkBitmap& other);
-#if defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_WIN)
// Converts to gfx::ImageSkiaRep and SkBitmap.
// TODO(pkotwicz): This is temporary till conversion to gfx::ImageSkia is
// done.
« no previous file with comments | « skia/ext/skia_utils_mac.mm ('k') | ui/gfx/image/image_skia_unittest.cc » ('j') | ui/gfx/image/image_skia_util_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698