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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 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 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 "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <memory> 10 #include <memory>
11 #include <set> 11 #include <set>
12 #include <string> 12 #include <string>
13 #include <utility> 13 #include <utility>
14 #include <vector> 14 #include <vector>
15 15
16 #include "ash/common/login_status.h" 16 #include "ash/common/login_status.h"
17 #include "ash/common/shell_delegate.h" 17 #include "ash/common/shell_delegate.h"
18 #include "ash/common/system/chromeos/bluetooth/bluetooth_observer.h"
19 #include "ash/common/system/chromeos/power/power_status.h"
20 #include "ash/common/system/chromeos/session/logout_button_observer.h"
21 #include "ash/common/system/date/clock_observer.h"
22 #include "ash/common/system/ime/ime_observer.h"
23 #include "ash/common/system/tray/system_tray_notifier.h"
24 #include "ash/common/system/tray_accessibility.h"
25 #include "ash/common/system/user/user_observer.h"
26 #include "ash/common/wm_shell.h" 18 #include "ash/common/wm_shell.h"
27 #include "ash/system/chromeos/rotation/tray_rotation_lock.h" 19 #include "ash/system/bluetooth/bluetooth_observer.h"
20 #include "ash/system/date/clock_observer.h"
21 #include "ash/system/ime/ime_observer.h"
22 #include "ash/system/power/power_status.h"
23 #include "ash/system/rotation/tray_rotation_lock.h"
24 #include "ash/system/session/logout_button_observer.h"
25 #include "ash/system/tray/system_tray_notifier.h"
26 #include "ash/system/tray_accessibility.h"
27 #include "ash/system/user/user_observer.h"
28 #include "base/bind_helpers.h" 28 #include "base/bind_helpers.h"
29 #include "base/callback.h" 29 #include "base/callback.h"
30 #include "base/logging.h" 30 #include "base/logging.h"
31 #include "base/memory/ptr_util.h" 31 #include "base/memory/ptr_util.h"
32 #include "base/memory/weak_ptr.h" 32 #include "base/memory/weak_ptr.h"
33 #include "base/metrics/user_metrics.h" 33 #include "base/metrics/user_metrics.h"
34 #include "base/strings/utf_string_conversions.h" 34 #include "base/strings/utf_string_conversions.h"
35 #include "base/sys_info.h" 35 #include "base/sys_info.h"
36 #include "base/time/time.h" 36 #include "base/time/time.h"
37 #include "chrome/browser/browser_process.h" 37 #include "chrome/browser/browser_process.h"
(...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after
961 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " 961 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
962 << "ENABLE_SUPERVISED_USERS undefined."; 962 << "ENABLE_SUPERVISED_USERS undefined.";
963 return base::string16(); 963 return base::string16();
964 } 964 }
965 965
966 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 966 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
967 return new SystemTrayDelegateChromeOS(); 967 return new SystemTrayDelegateChromeOS();
968 } 968 }
969 969
970 } // namespace chromeos 970 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698