| 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/resolution_notification_controller.h" | 5 #include "ash/display/resolution_notification_controller.h" |
| 6 | 6 |
| 7 #include "ash/display/display_controller.h" | 7 #include "ash/display/display_controller.h" |
| 8 #include "ash/display/display_manager.h" | 8 #include "ash/display/display_manager.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/system/system_notifier.h" | 10 #include "ash/system/system_notifier.h" |
| 11 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
| 12 #include "grit/ash_resources.h" | 12 #include "grit/ash_resources.h" |
| 13 #include "grit/ash_strings.h" | 13 #include "grit/ash_strings.h" |
| 14 #include "ui/base/l10n/l10n_util.h" | 14 #include "ui/base/l10n/l10n_util.h" |
| 15 #include "ui/base/l10n/time_format.h" | 15 #include "ui/base/l10n/time_format.h" |
| 16 #include "ui/base/resource/resource_bundle.h" | 16 #include "ui/base/resource/resource_bundle.h" |
| 17 #include "ui/gfx/display.h" | 17 #include "ui/gfx/display.h" |
| 18 #include "ui/gfx/screen.h" | 18 #include "ui/gfx/screen.h" |
| 19 #include "ui/message_center/message_center.h" | 19 #include "ui/message_center/message_center.h" |
| 20 #include "ui/message_center/notification.h" | 20 #include "ui/message_center/notification.h" |
| 21 #include "ui/message_center/notification_delegate.h" | 21 #include "ui/message_center/notification_delegate.h" |
| 22 | 22 |
| 23 using message_center::Notification; | 23 using message_center::Notification; |
| 24 | 24 |
| 25 namespace ash { | 25 namespace ash { |
| 26 namespace internal { | |
| 27 namespace { | 26 namespace { |
| 28 | 27 |
| 29 bool g_use_timer = true; | 28 bool g_use_timer = true; |
| 30 | 29 |
| 31 class ResolutionChangeNotificationDelegate | 30 class ResolutionChangeNotificationDelegate |
| 32 : public message_center::NotificationDelegate { | 31 : public message_center::NotificationDelegate { |
| 33 public: | 32 public: |
| 34 ResolutionChangeNotificationDelegate( | 33 ResolutionChangeNotificationDelegate( |
| 35 ResolutionNotificationController* controller, | 34 ResolutionNotificationController* controller, |
| 36 bool has_timeout); | 35 bool has_timeout); |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 base::TimeDelta::FromSeconds(1), | 312 base::TimeDelta::FromSeconds(1), |
| 314 this, | 313 this, |
| 315 &ResolutionNotificationController::OnTimerTick); | 314 &ResolutionNotificationController::OnTimerTick); |
| 316 } | 315 } |
| 317 } | 316 } |
| 318 | 317 |
| 319 void ResolutionNotificationController::SuppressTimerForTest() { | 318 void ResolutionNotificationController::SuppressTimerForTest() { |
| 320 g_use_timer = false; | 319 g_use_timer = false; |
| 321 } | 320 } |
| 322 | 321 |
| 323 } // namespace internal | |
| 324 } // namespace ash | 322 } // namespace ash |
| OLD | NEW |