| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_change_observer_chromeos.h" | 5 #include "ash/display/display_change_observer_chromeos.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| 11 #include <utility> | 11 #include <utility> |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "ash/ash_switches.h" | 14 #include "ash/ash_switches.h" |
| 15 #include "ash/display/display_info.h" | 15 #include "ash/display/display_info.h" |
| 16 #include "ash/display/display_layout_store.h" | 16 #include "ash/display/display_layout_store.h" |
| 17 #include "ash/display/display_manager.h" | 17 #include "ash/display/display_manager.h" |
| 18 #include "ash/shell.h" | 18 #include "ash/shell.h" |
| 19 #include "ash/touch/touchscreen_util.h" | 19 #include "ash/touch/touchscreen_util.h" |
| 20 #include "base/command_line.h" | 20 #include "base/command_line.h" |
| 21 #include "base/logging.h" | 21 #include "base/logging.h" |
| 22 #include "grit/ash_strings.h" | 22 #include "grit/ash_strings.h" |
| 23 #include "ui/base/l10n/l10n_util.h" | 23 #include "ui/base/l10n/l10n_util.h" |
| 24 #include "ui/compositor/dip_util.h" | 24 #include "ui/compositor/dip_util.h" |
| 25 #include "ui/display/types/display_mode.h" | 25 #include "ui/display/types/display_mode.h" |
| 26 #include "ui/display/types/display_snapshot.h" | 26 #include "ui/display/types/display_snapshot.h" |
| 27 #include "ui/display/util/display_util.h" | 27 #include "ui/display/util/display_util.h" |
| 28 #include "ui/events/device_data_manager.h" | 28 #include "ui/events/devices/device_data_manager.h" |
| 29 #include "ui/events/touchscreen_device.h" | 29 #include "ui/events/devices/touchscreen_device.h" |
| 30 #include "ui/gfx/display.h" | 30 #include "ui/gfx/display.h" |
| 31 #include "ui/wm/core/user_activity_detector.h" | 31 #include "ui/wm/core/user_activity_detector.h" |
| 32 | 32 |
| 33 namespace ash { | 33 namespace ash { |
| 34 | 34 |
| 35 using ui::DisplayConfigurator; | 35 using ui::DisplayConfigurator; |
| 36 | 36 |
| 37 namespace { | 37 namespace { |
| 38 | 38 |
| 39 // The DPI threshold to determine the device scale factor. | 39 // The DPI threshold to determine the device scale factor. |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 | 291 |
| 292 void DisplayChangeObserver::OnTouchscreenDeviceConfigurationChanged() { | 292 void DisplayChangeObserver::OnTouchscreenDeviceConfigurationChanged() { |
| 293 OnDisplayModeChanged( | 293 OnDisplayModeChanged( |
| 294 Shell::GetInstance()->display_configurator()->cached_displays()); | 294 Shell::GetInstance()->display_configurator()->cached_displays()); |
| 295 } | 295 } |
| 296 | 296 |
| 297 void DisplayChangeObserver::OnKeyboardDeviceConfigurationChanged() { | 297 void DisplayChangeObserver::OnKeyboardDeviceConfigurationChanged() { |
| 298 } | 298 } |
| 299 | 299 |
| 300 } // namespace ash | 300 } // namespace ash |
| OLD | NEW |