| 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/common/ash_switches.h" | |
| 15 #include "ash/common/wm_shell.h" | 14 #include "ash/common/wm_shell.h" |
| 16 #include "ash/display/display_manager.h" | 15 #include "ash/display/display_manager.h" |
| 17 #include "ash/display/display_util.h" | 16 #include "ash/display/display_util.h" |
| 18 #include "ash/shell.h" | 17 #include "ash/shell.h" |
| 19 #include "ash/touch/touchscreen_util.h" | 18 #include "ash/touch/touchscreen_util.h" |
| 20 #include "base/command_line.h" | 19 #include "base/command_line.h" |
| 21 #include "base/logging.h" | 20 #include "base/logging.h" |
| 22 #include "grit/ash_strings.h" | 21 #include "grit/ash_strings.h" |
| 23 #include "ui/base/l10n/l10n_util.h" | 22 #include "ui/base/l10n/l10n_util.h" |
| 24 #include "ui/base/user_activity/user_activity_detector.h" | 23 #include "ui/base/user_activity/user_activity_detector.h" |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 } | 315 } |
| 317 return 1.0f; | 316 return 1.0f; |
| 318 } | 317 } |
| 319 | 318 |
| 320 void DisplayChangeObserver::OnTouchscreenDeviceConfigurationChanged() { | 319 void DisplayChangeObserver::OnTouchscreenDeviceConfigurationChanged() { |
| 321 OnDisplayModeChanged( | 320 OnDisplayModeChanged( |
| 322 Shell::GetInstance()->display_configurator()->cached_displays()); | 321 Shell::GetInstance()->display_configurator()->cached_displays()); |
| 323 } | 322 } |
| 324 | 323 |
| 325 } // namespace ash | 324 } // namespace ash |
| OLD | NEW |