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_manager.h" | 5 #include "ash/display/display_manager.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
11 #include <vector> | 11 #include <vector> |
12 | 12 |
13 #include "ash/ash_switches.h" | 13 #include "ash/ash_switches.h" |
14 #include "ash/display/display_layout_store.h" | 14 #include "ash/display/display_layout_store.h" |
15 #include "ash/display/screen_ash.h" | 15 #include "ash/display/screen_ash.h" |
16 #include "ash/screen_util.h" | 16 #include "ash/screen_util.h" |
17 #include "ash/shell.h" | 17 #include "ash/shell.h" |
18 #include "base/auto_reset.h" | 18 #include "base/auto_reset.h" |
19 #include "base/command_line.h" | 19 #include "base/command_line.h" |
20 #include "base/logging.h" | 20 #include "base/logging.h" |
21 #include "base/metrics/histogram.h" | 21 #include "base/metrics/histogram.h" |
22 #include "base/strings/string_number_conversions.h" | 22 #include "base/strings/string_number_conversions.h" |
23 #include "base/strings/string_split.h" | 23 #include "base/strings/string_split.h" |
24 #include "base/strings/stringprintf.h" | 24 #include "base/strings/stringprintf.h" |
25 #include "base/strings/utf_string_conversions.h" | 25 #include "base/strings/utf_string_conversions.h" |
26 #include "grit/ash_strings.h" | 26 #include "grit/ash_strings.h" |
27 #include "ui/base/l10n/l10n_util.h" | 27 #include "ui/base/l10n/l10n_util.h" |
28 #include "ui/base/layout.h" | |
29 #include "ui/base/resource/resource_bundle.h" | |
30 #include "ui/gfx/display.h" | 28 #include "ui/gfx/display.h" |
31 #include "ui/gfx/display_observer.h" | 29 #include "ui/gfx/display_observer.h" |
32 #include "ui/gfx/font_render_params.h" | 30 #include "ui/gfx/font_render_params.h" |
33 #include "ui/gfx/rect.h" | 31 #include "ui/gfx/rect.h" |
34 #include "ui/gfx/screen.h" | 32 #include "ui/gfx/screen.h" |
35 #include "ui/gfx/size_conversions.h" | 33 #include "ui/gfx/size_conversions.h" |
36 | 34 |
37 #if defined(USE_X11) | 35 #if defined(USE_X11) |
38 #include "ui/base/x/x11_util.h" | 36 #include "ui/base/x/x11_util.h" |
39 #endif | 37 #endif |
(...skipping 1221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1261 new_secondary_origin.Offset(-secondary_bounds.width(), offset); | 1259 new_secondary_origin.Offset(-secondary_bounds.width(), offset); |
1262 break; | 1260 break; |
1263 } | 1261 } |
1264 gfx::Insets insets = secondary_display->GetWorkAreaInsets(); | 1262 gfx::Insets insets = secondary_display->GetWorkAreaInsets(); |
1265 secondary_display->set_bounds( | 1263 secondary_display->set_bounds( |
1266 gfx::Rect(new_secondary_origin, secondary_bounds.size())); | 1264 gfx::Rect(new_secondary_origin, secondary_bounds.size())); |
1267 secondary_display->UpdateWorkAreaFromInsets(insets); | 1265 secondary_display->UpdateWorkAreaFromInsets(insets); |
1268 } | 1266 } |
1269 | 1267 |
1270 } // namespace ash | 1268 } // namespace ash |
OLD | NEW |