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

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

Issue 817153002: Switch users of foundation_util.h to include it directly and clean up uses of mac_util.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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/base/resource/resource_bundle_mac.mm ('k') | ui/gfx/image/image.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/color_profile.h" 5 #include "ui/gfx/color_profile.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "base/mac/mac_util.h" 9 #include "base/mac/mac_util.h"
10 #include "base/mac/scoped_cftyperef.h"
10 #include "ui/gfx/mac/coordinate_conversion.h" 11 #include "ui/gfx/mac/coordinate_conversion.h"
11 12
12 namespace { 13 namespace {
13 14
14 NSScreen* GetNSScreenFromBounds(const gfx::Rect& bounds) { 15 NSScreen* GetNSScreenFromBounds(const gfx::Rect& bounds) {
15 NSScreen* screen = nil; 16 NSScreen* screen = nil;
16 int overlap = 0; 17 int overlap = 0;
17 18
18 for (NSScreen* monitor in [NSScreen screens]) { 19 for (NSScreen* monitor in [NSScreen screens]) {
19 gfx::Rect monitor_rect = gfx::ScreenRectFromNSRect([monitor frame]); 20 gfx::Rect monitor_rect = gfx::ScreenRectFromNSRect([monitor frame]);
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 if (!icc_profile) 61 if (!icc_profile)
61 return; 62 return;
62 size_t length = CFDataGetLength(icc_profile); 63 size_t length = CFDataGetLength(icc_profile);
63 if (gfx::InvalidColorProfileLength(length)) 64 if (gfx::InvalidColorProfileLength(length))
64 return; 65 return;
65 const unsigned char* data = CFDataGetBytePtr(icc_profile); 66 const unsigned char* data = CFDataGetBytePtr(icc_profile);
66 profile->assign(data, data + length); 67 profile->assign(data, data + length);
67 } 68 }
68 69
69 } // namespace gfx 70 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/base/resource/resource_bundle_mac.mm ('k') | ui/gfx/image/image.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698