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/display/screen.h" | 5 #include "ui/display/screen.h" |
6 | 6 |
7 #import <ApplicationServices/ApplicationServices.h> | 7 #import <ApplicationServices/ApplicationServices.h> |
8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
11 #include <map> | 11 #include <map> |
12 #include <memory> | 12 #include <memory> |
13 | 13 |
14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
15 #include "base/logging.h" | 15 #include "base/logging.h" |
16 #include "base/mac/mac_util.h" | 16 #include "base/mac/mac_util.h" |
17 #include "base/mac/sdk_forward_declarations.h" | 17 #include "base/mac/sdk_forward_declarations.h" |
18 #include "base/macros.h" | 18 #include "base/macros.h" |
19 #include "base/timer/timer.h" | 19 #include "base/timer/timer.h" |
20 #include "ui/display/display.h" | 20 #include "ui/display/display.h" |
21 #include "ui/display/display_change_notifier.h" | 21 #include "ui/display/display_change_notifier.h" |
| 22 #include "ui/gfx/color_space_switches.h" |
22 #include "ui/gfx/mac/coordinate_conversion.h" | 23 #include "ui/gfx/mac/coordinate_conversion.h" |
23 #include "ui/gfx/switches.h" | |
24 | 24 |
25 extern "C" { | 25 extern "C" { |
26 Boolean CGDisplayUsesForceToGray(void); | 26 Boolean CGDisplayUsesForceToGray(void); |
27 } | 27 } |
28 | 28 |
29 namespace display { | 29 namespace display { |
30 namespace { | 30 namespace { |
31 | 31 |
32 // The delay to handle the display configuration changes. | 32 // The delay to handle the display configuration changes. |
33 // See comments in ScreenMac::HandleDisplayReconfiguration. | 33 // See comments in ScreenMac::HandleDisplayReconfiguration. |
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
345 return window; | 345 return window; |
346 } | 346 } |
347 | 347 |
348 #if !defined(USE_AURA) | 348 #if !defined(USE_AURA) |
349 Screen* CreateNativeScreen() { | 349 Screen* CreateNativeScreen() { |
350 return new ScreenMac; | 350 return new ScreenMac; |
351 } | 351 } |
352 #endif | 352 #endif |
353 | 353 |
354 } // namespace display | 354 } // namespace display |
OLD | NEW |