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

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

Issue 832953002: Cleanup: Update the path to gfx size headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE Created 5 years, 11 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
« no previous file with comments | « ui/gfx/image/image_ios.mm ('k') | ui/gfx/image/image_png_rep.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "ui/gfx/image/image.h" 5 #include "ui/gfx/image/image.h"
6 6
7 #import <AppKit/AppKit.h> 7 #import <AppKit/AppKit.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
11 #include "ui/gfx/geometry/size.h"
11 #include "ui/gfx/image/image_png_rep.h" 12 #include "ui/gfx/image/image_png_rep.h"
12 #include "ui/gfx/size.h"
13 13
14 namespace gfx { 14 namespace gfx {
15 namespace internal { 15 namespace internal {
16 16
17 namespace { 17 namespace {
18 18
19 // Returns a 16x16 red NSImage to visually show when a NSImage cannot be 19 // Returns a 16x16 red NSImage to visually show when a NSImage cannot be
20 // created from PNG data. 20 // created from PNG data.
21 // Caller takes ownership of the returned NSImage. 21 // Caller takes ownership of the returned NSImage.
22 NSImage* GetErrorNSImage() { 22 NSImage* GetErrorNSImage() {
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 gfx::Size NSImageSize(NSImage* image) { 102 gfx::Size NSImageSize(NSImage* image) {
103 NSSize size = [image size]; 103 NSSize size = [image size];
104 int width = static_cast<int>(size.width); 104 int width = static_cast<int>(size.width);
105 int height = static_cast<int>(size.height); 105 int height = static_cast<int>(size.height);
106 return gfx::Size(width, height); 106 return gfx::Size(width, height);
107 } 107 }
108 108
109 } // namespace internal 109 } // namespace internal
110 } // namespace gfx 110 } // namespace gfx
111 111
OLDNEW
« no previous file with comments | « ui/gfx/image/image_ios.mm ('k') | ui/gfx/image/image_png_rep.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698