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 "ash/display/display_controller.h" | 5 #include "ash/display/display_controller.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <map> | 9 #include <map> |
10 | 10 |
11 #include "ash/ash_root_window_transformer.h" | 11 #include "ash/ash_root_window_transformer.h" |
12 #include "ash/ash_switches.h" | 12 #include "ash/ash_switches.h" |
13 #include "ash/display/display_manager.h" | 13 #include "ash/display/display_manager.h" |
14 #include "ash/display/display_pref_util.h" | 14 #include "ash/display/display_pref_util.h" |
15 #include "ash/host/root_window_host_factory.h" | 15 #include "ash/host/root_window_host_factory.h" |
16 #include "ash/root_window_controller.h" | 16 #include "ash/root_window_controller.h" |
17 #include "ash/screen_ash.h" | 17 #include "ash/screen_ash.h" |
18 #include "ash/shell.h" | 18 #include "ash/shell.h" |
19 #include "ash/wm/coordinate_conversion.h" | 19 #include "ash/wm/coordinate_conversion.h" |
20 #include "ash/wm/property_util.h" | 20 #include "ash/wm/property_util.h" |
21 #include "ash/wm/window_util.h" | 21 #include "ash/wm/window_util.h" |
22 #include "base/command_line.h" | 22 #include "base/command_line.h" |
23 #include "base/json/json_value_converter.h" | 23 #include "base/json/json_value_converter.h" |
24 #include "base/string_piece.h" | |
25 #include "base/stringprintf.h" | 24 #include "base/stringprintf.h" |
26 #include "base/strings/string_number_conversions.h" | 25 #include "base/strings/string_number_conversions.h" |
| 26 #include "base/strings/string_piece.h" |
27 #include "base/values.h" | 27 #include "base/values.h" |
28 #include "third_party/skia/include/utils/SkMatrix44.h" | 28 #include "third_party/skia/include/utils/SkMatrix44.h" |
29 #include "ui/aura/client/cursor_client.h" | 29 #include "ui/aura/client/cursor_client.h" |
30 #include "ui/aura/client/screen_position_client.h" | 30 #include "ui/aura/client/screen_position_client.h" |
31 #include "ui/aura/env.h" | 31 #include "ui/aura/env.h" |
32 #include "ui/aura/root_window.h" | 32 #include "ui/aura/root_window.h" |
33 #include "ui/aura/window.h" | 33 #include "ui/aura/window.h" |
34 #include "ui/aura/window_property.h" | 34 #include "ui/aura/window_property.h" |
35 #include "ui/compositor/compositor.h" | 35 #include "ui/compositor/compositor.h" |
36 #include "ui/compositor/dip_util.h" | 36 #include "ui/compositor/dip_util.h" |
(...skipping 996 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1033 } | 1033 } |
1034 | 1034 |
1035 void DisplayController::OnFadeOutForSwapDisplayFinished() { | 1035 void DisplayController::OnFadeOutForSwapDisplayFinished() { |
1036 #if defined(OS_CHROMEOS) | 1036 #if defined(OS_CHROMEOS) |
1037 SetPrimaryDisplay(ScreenAsh::GetSecondaryDisplay()); | 1037 SetPrimaryDisplay(ScreenAsh::GetSecondaryDisplay()); |
1038 Shell::GetInstance()->output_configurator_animation()->StartFadeInAnimation(); | 1038 Shell::GetInstance()->output_configurator_animation()->StartFadeInAnimation(); |
1039 #endif | 1039 #endif |
1040 } | 1040 } |
1041 | 1041 |
1042 } // namespace ash | 1042 } // namespace ash |
OLD | NEW |