| 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 <utility> | 7 #include <utility> | 
| 8 | 8 | 
| 9 #include "ash/common/system/system_notifier.h" |  | 
| 10 #include "ash/resources/grit/ash_resources.h" | 9 #include "ash/resources/grit/ash_resources.h" | 
| 11 #include "ash/shell.h" | 10 #include "ash/shell.h" | 
| 12 #include "ash/strings/grit/ash_strings.h" | 11 #include "ash/strings/grit/ash_strings.h" | 
|  | 12 #include "ash/system/system_notifier.h" | 
| 13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.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/display/display.h" | 17 #include "ui/display/display.h" | 
| 18 #include "ui/display/manager/display_manager.h" | 18 #include "ui/display/manager/display_manager.h" | 
| 19 #include "ui/display/manager/managed_display_info.h" | 19 #include "ui/display/manager/managed_display_info.h" | 
| 20 #include "ui/display/screen.h" | 20 #include "ui/display/screen.h" | 
| 21 #include "ui/message_center/message_center.h" | 21 #include "ui/message_center/message_center.h" | 
| 22 #include "ui/message_center/notification.h" | 22 #include "ui/message_center/notification.h" | 
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 310     change_info_->timer.Start(FROM_HERE, base::TimeDelta::FromSeconds(1), this, | 310     change_info_->timer.Start(FROM_HERE, base::TimeDelta::FromSeconds(1), this, | 
| 311                               &ResolutionNotificationController::OnTimerTick); | 311                               &ResolutionNotificationController::OnTimerTick); | 
| 312   } | 312   } | 
| 313 } | 313 } | 
| 314 | 314 | 
| 315 void ResolutionNotificationController::SuppressTimerForTest() { | 315 void ResolutionNotificationController::SuppressTimerForTest() { | 
| 316   g_use_timer = false; | 316   g_use_timer = false; | 
| 317 } | 317 } | 
| 318 | 318 | 
| 319 }  // namespace ash | 319 }  // namespace ash | 
| OLD | NEW | 
|---|