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

Side by Side Diff: ui/gfx/image_mac.mm

Issue 6533013: Move ui::gfx::Image out of the ui namespace to be just gfx::Image. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gfx/image.cc ('k') | ui/gfx/image_unittest.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <AppKit/AppKit.h> 5 #import <AppKit/AppKit.h>
6 6
7 #include "skia/ext/skia_utils_mac.h" 7 #include "skia/ext/skia_utils_mac.h"
8 #include "third_party/skia/include/core/SkBitmap.h" 8 #include "third_party/skia/include/core/SkBitmap.h"
9 9
10 namespace ui {
11 namespace gfx { 10 namespace gfx {
12 namespace internal { 11 namespace internal {
13 12
14 const SkBitmap* NSImageToSkBitmap(NSImage* image) { 13 const SkBitmap* NSImageToSkBitmap(NSImage* image) {
15 return new SkBitmap(::gfx::NSImageToSkBitmap(image, [image size], false)); 14 return new SkBitmap(::gfx::NSImageToSkBitmap(image, [image size], false));
16 } 15 }
17 16
18 } // namespace internal 17 } // namespace internal
19 } // namespace gfx 18 } // namespace gfx
20 } // namespace ui
OLDNEW
« no previous file with comments | « ui/gfx/image.cc ('k') | ui/gfx/image_unittest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698