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

Unified Diff: ui/gfx/image.h

Issue 6541031: Integrate gfx::Image into the ResourceBundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add some comments Created 9 years, 10 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 | « ui/base/resource/resource_bundle_posix.cc ('k') | ui/gfx/image.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image.h
diff --git a/ui/gfx/image.h b/ui/gfx/image.h
index 33e363e0a21e2cc9c37dab32b659019e417d1279..7666249ac0186bcbf961366d0f945e63098a14a3 100644
--- a/ui/gfx/image.h
+++ b/ui/gfx/image.h
@@ -12,7 +12,8 @@
#include "base/gtest_prod_util.h"
#include "build/build_config.h"
#include "ui/gfx/native_widget_types.h" // Forward-declares GdkPixbuf and NSImage.
-#include "third_party/skia/include/core/SkBitmap.h"
+
+class SkBitmap;
namespace {
class ImageTest;
@@ -43,10 +44,10 @@ class Image {
// ownership of the image.
explicit Image(const SkBitmap* bitmap);
#if defined(OS_LINUX)
- // Does not increase |pixbuf|'s reference count.
+ // Does not increase |pixbuf|'s reference count; expects to take ownership.
explicit Image(GdkPixbuf* pixbuf);
#elif defined(OS_MACOSX)
- // Does not retain |image|.
+ // Does not retain |image|; expects to take ownership.
explicit Image(NSImage* image);
#endif
« no previous file with comments | « ui/base/resource/resource_bundle_posix.cc ('k') | ui/gfx/image.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698