Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Side by Side Diff: ash/system/chromeos/power/tray_power.cc

Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/system/chromeos/power/tray_power.h" 5 #include "ash/system/chromeos/power/tray_power.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/accessibility_delegate.h"
10 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/common/accessibility_delegate.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/system/chromeos/devicetype_utils.h" 12 #include "ash/system/chromeos/devicetype_utils.h"
13 #include "ash/system/chromeos/power/battery_notification.h" 13 #include "ash/system/chromeos/power/battery_notification.h"
14 #include "ash/system/chromeos/power/dual_role_notification.h" 14 #include "ash/system/chromeos/power/dual_role_notification.h"
15 #include "ash/system/date/date_view.h" 15 #include "ash/system/date/date_view.h"
16 #include "ash/system/system_notifier.h" 16 #include "ash/system/system_notifier.h"
17 #include "ash/system/tray/system_tray_delegate.h" 17 #include "ash/system/tray/system_tray_delegate.h"
18 #include "ash/system/tray/tray_constants.h" 18 #include "ash/system/tray/tray_constants.h"
19 #include "ash/system/tray/tray_utils.h" 19 #include "ash/system/tray/tray_utils.h"
20 #include "base/command_line.h" 20 #include "base/command_line.h"
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 } 356 }
357 NOTREACHED(); 357 NOTREACHED();
358 return false; 358 return false;
359 } 359 }
360 360
361 void TrayPower::NotifyUsbNotificationClosedByUser() { 361 void TrayPower::NotifyUsbNotificationClosedByUser() {
362 usb_notification_dismissed_ = true; 362 usb_notification_dismissed_ = true;
363 } 363 }
364 364
365 } // namespace ash 365 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698