| 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 "ash/common/system/chromeos/power/tray_power.h" | 5 #include "ash/system/power/tray_power.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/common/accessibility_delegate.h" | 9 #include "ash/common/accessibility_delegate.h" |
| 10 #include "ash/common/ash_switches.h" | 10 #include "ash/common/ash_switches.h" |
| 11 #include "ash/common/system/chromeos/devicetype_utils.h" | |
| 12 #include "ash/common/system/chromeos/power/battery_notification.h" | |
| 13 #include "ash/common/system/chromeos/power/dual_role_notification.h" | |
| 14 #include "ash/common/system/date/date_view.h" | |
| 15 #include "ash/common/system/system_notifier.h" | |
| 16 #include "ash/common/system/tray/system_tray_delegate.h" | |
| 17 #include "ash/common/system/tray/tray_constants.h" | |
| 18 #include "ash/common/system/tray/tray_item_view.h" | |
| 19 #include "ash/common/system/tray/tray_utils.h" | |
| 20 #include "ash/resources/grit/ash_resources.h" | 11 #include "ash/resources/grit/ash_resources.h" |
| 21 #include "ash/strings/grit/ash_strings.h" | 12 #include "ash/strings/grit/ash_strings.h" |
| 13 #include "ash/system/date/date_view.h" |
| 14 #include "ash/system/devicetype_utils.h" |
| 15 #include "ash/system/power/battery_notification.h" |
| 16 #include "ash/system/power/dual_role_notification.h" |
| 17 #include "ash/system/system_notifier.h" |
| 18 #include "ash/system/tray/system_tray_delegate.h" |
| 19 #include "ash/system/tray/tray_constants.h" |
| 20 #include "ash/system/tray/tray_item_view.h" |
| 21 #include "ash/system/tray/tray_utils.h" |
| 22 #include "base/command_line.h" | 22 #include "base/command_line.h" |
| 23 #include "base/logging.h" | 23 #include "base/logging.h" |
| 24 #include "base/metrics/histogram.h" | 24 #include "base/metrics/histogram.h" |
| 25 #include "base/time/time.h" | 25 #include "base/time/time.h" |
| 26 #include "ui/accessibility/ax_node_data.h" | 26 #include "ui/accessibility/ax_node_data.h" |
| 27 #include "ui/base/resource/resource_bundle.h" | 27 #include "ui/base/resource/resource_bundle.h" |
| 28 #include "ui/message_center/message_center.h" | 28 #include "ui/message_center/message_center.h" |
| 29 #include "ui/message_center/notification.h" | 29 #include "ui/message_center/notification.h" |
| 30 #include "ui/message_center/notification_delegate.h" | 30 #include "ui/message_center/notification_delegate.h" |
| 31 #include "ui/views/controls/image_view.h" | 31 #include "ui/views/controls/image_view.h" |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 } | 354 } |
| 355 NOTREACHED(); | 355 NOTREACHED(); |
| 356 return false; | 356 return false; |
| 357 } | 357 } |
| 358 | 358 |
| 359 void TrayPower::NotifyUsbNotificationClosedByUser() { | 359 void TrayPower::NotifyUsbNotificationClosedByUser() { |
| 360 usb_notification_dismissed_ = true; | 360 usb_notification_dismissed_ = true; |
| 361 } | 361 } |
| 362 | 362 |
| 363 } // namespace ash | 363 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2732813002:
chromeos: Move files in //ash/common to //ash, part 1 (Closed)
