| 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/manager/display_manager.h" | 5 #include "ui/display/manager/display_manager.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <limits> | 9 #include <limits> |
| 10 #include <map> | 10 #include <map> |
| 11 #include <set> | 11 #include <set> |
| 12 #include <string> | 12 #include <string> |
| 13 #include <utility> | 13 #include <utility> |
| 14 #include <vector> | 14 #include <vector> |
| 15 | 15 |
| 16 #include "base/auto_reset.h" | 16 #include "base/auto_reset.h" |
| 17 #include "base/bind.h" | 17 #include "base/bind.h" |
| 18 #include "base/command_line.h" | 18 #include "base/command_line.h" |
| 19 #include "base/logging.h" | 19 #include "base/logging.h" |
| 20 #include "base/memory/ptr_util.h" | 20 #include "base/memory/ptr_util.h" |
| 21 #include "base/metrics/histogram_macros.h" | 21 #include "base/metrics/histogram_macros.h" |
| 22 #include "base/run_loop.h" | 22 #include "base/run_loop.h" |
| 23 #include "base/strings/string_number_conversions.h" | 23 #include "base/strings/string_number_conversions.h" |
| 24 #include "base/strings/string_split.h" | 24 #include "base/strings/string_split.h" |
| 25 #include "base/strings/stringprintf.h" | 25 #include "base/strings/stringprintf.h" |
| 26 #include "base/strings/utf_string_conversions.h" | 26 #include "base/strings/utf_string_conversions.h" |
| 27 #include "base/threading/thread_task_runner_handle.h" | 27 #include "base/threading/thread_task_runner_handle.h" |
| 28 #include "ui/base/l10n/l10n_util.h" | 28 #include "ui/base/l10n/l10n_util.h" |
| 29 #include "ui/display/display.h" | 29 #include "ui/display/display.h" |
| 30 #include "ui/display/display_finder.h" |
| 30 #include "ui/display/display_observer.h" | 31 #include "ui/display/display_observer.h" |
| 31 #include "ui/display/display_switches.h" | 32 #include "ui/display/display_switches.h" |
| 32 #include "ui/display/manager/display_layout_store.h" | 33 #include "ui/display/manager/display_layout_store.h" |
| 33 #include "ui/display/manager/display_manager_utilities.h" | 34 #include "ui/display/manager/display_manager_utilities.h" |
| 34 #include "ui/display/manager/managed_display_info.h" | 35 #include "ui/display/manager/managed_display_info.h" |
| 35 #include "ui/display/screen.h" | 36 #include "ui/display/screen.h" |
| 36 #include "ui/gfx/font_render_params.h" | 37 #include "ui/gfx/font_render_params.h" |
| 37 #include "ui/gfx/geometry/rect.h" | 38 #include "ui/gfx/geometry/rect.h" |
| 38 #include "ui/gfx/geometry/size_conversions.h" | 39 #include "ui/gfx/geometry/size_conversions.h" |
| 39 #include "ui/strings/grit/ui_strings.h" | 40 #include "ui/strings/grit/ui_strings.h" |
| (...skipping 1410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1450 } | 1451 } |
| 1451 | 1452 |
| 1452 const Display& DisplayManager::GetSecondaryDisplay() const { | 1453 const Display& DisplayManager::GetSecondaryDisplay() const { |
| 1453 CHECK_LE(2U, GetNumDisplays()); | 1454 CHECK_LE(2U, GetNumDisplays()); |
| 1454 return GetDisplayAt(0).id() == Screen::GetScreen()->GetPrimaryDisplay().id() | 1455 return GetDisplayAt(0).id() == Screen::GetScreen()->GetPrimaryDisplay().id() |
| 1455 ? GetDisplayAt(1) | 1456 ? GetDisplayAt(1) |
| 1456 : GetDisplayAt(0); | 1457 : GetDisplayAt(0); |
| 1457 } | 1458 } |
| 1458 | 1459 |
| 1459 } // namespace display | 1460 } // namespace display |
| OLD | NEW |