Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/color_profile.h" | 5 #include "ui/gfx/color_profile.h" |
| 6 | 6 |
| 7 namespace gfx { | 7 namespace gfx { |
| 8 | 8 |
| 9 #if defined(OS_WIN) || defined(OS_MACOSX) | 9 #if defined(OS_WIN) || defined(OS_MACOSX) |
|
Robert Sesek
2015/01/20 17:03:39
What are these redeclarations for? They're already
Noel Gordon
2015/01/22 16:26:57
Mainly for doumentation it seems.
Robert Sesek
2015/01/23 14:30:47
I don't follow. I.e., I think these should be remo
| |
| 10 void ReadColorProfile(std::vector<char>* profile); | 10 void ReadColorProfile(std::vector<char>* profile); |
| 11 GFX_EXPORT bool GetDisplayColorProfile(const gfx::Rect& bounds, | 11 GFX_EXPORT bool GetDisplayColorProfile(const gfx::Rect& bounds, |
| 12 std::vector<char>* profile); | 12 std::vector<char>* profile); |
| 13 #if defined(OS_MACOSX) | |
| 14 GFX_EXPORT bool GetDisplayColorProfile(gfx::NativeWindow window, | |
| 15 std::vector<char>* profile); | |
| 16 #endif | |
| 13 #else | 17 #else |
| 14 void ReadColorProfile(std::vector<char>* profile) { } | 18 void ReadColorProfile(std::vector<char>* profile) { } |
| 15 GFX_EXPORT bool GetDisplayColorProfile(const gfx::Rect& bounds, | 19 GFX_EXPORT bool GetDisplayColorProfile(const gfx::Rect& bounds, |
| 16 std::vector<char>* profile) { | 20 std::vector<char>* profile) { |
| 17 // TODO(port): consider screen color profile support. | 21 // TODO(port): consider screen color profile support. |
| 18 return false; | 22 return false; |
| 19 } | 23 } |
| 20 #endif | 24 #endif |
| 21 | 25 |
| 22 ColorProfile::ColorProfile() { | 26 ColorProfile::ColorProfile() { |
| 23 // TODO: support multiple monitors. | 27 // TODO: support multiple monitors. |
| 24 ReadColorProfile(&profile_); | 28 ReadColorProfile(&profile_); |
| 25 } | 29 } |
| 26 | 30 |
| 27 ColorProfile::~ColorProfile() { | 31 ColorProfile::~ColorProfile() { |
| 28 } | 32 } |
| 29 | 33 |
| 30 } // namespace gfx | 34 } // namespace gfx |
| OLD | NEW |