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

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

Issue 2314853003: Move ash::DisplayManager switches to ui::display (Closed)
Patch Set: rebased again Created 4 years, 3 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 <set> 10 #include <set>
11 #include <string> 11 #include <string>
12 #include <utility> 12 #include <utility>
13 #include <vector> 13 #include <vector>
14 14
15 #include "ash/common/ash_switches.h"
16 #include "ash/common/login_status.h" 15 #include "ash/common/login_status.h"
17 #include "ash/common/session/session_state_delegate.h" 16 #include "ash/common/session/session_state_delegate.h"
18 #include "ash/common/session/session_state_observer.h" 17 #include "ash/common/session/session_state_observer.h"
19 #include "ash/common/shell_delegate.h" 18 #include "ash/common/shell_delegate.h"
20 #include "ash/common/shell_window_ids.h" 19 #include "ash/common/shell_window_ids.h"
21 #include "ash/common/system/chromeos/bluetooth/bluetooth_observer.h" 20 #include "ash/common/system/chromeos/bluetooth/bluetooth_observer.h"
22 #include "ash/common/system/chromeos/power/power_status.h" 21 #include "ash/common/system/chromeos/power/power_status.h"
23 #include "ash/common/system/chromeos/session/logout_button_observer.h" 22 #include "ash/common/system/chromeos/session/logout_button_observer.h"
24 #include "ash/common/system/chromeos/shutdown_policy_observer.h" 23 #include "ash/common/system/chromeos/shutdown_policy_observer.h"
25 #include "ash/common/system/date/clock_observer.h" 24 #include "ash/common/system/date/clock_observer.h"
(...skipping 1308 matching lines...) Expand 10 before | Expand all | Expand 10 after
1334 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " 1333 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
1335 << "ENABLE_SUPERVISED_USERS undefined."; 1334 << "ENABLE_SUPERVISED_USERS undefined.";
1336 return base::string16(); 1335 return base::string16();
1337 } 1336 }
1338 1337
1339 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1338 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1340 return new SystemTrayDelegateChromeOS(); 1339 return new SystemTrayDelegateChromeOS();
1341 } 1340 }
1342 1341
1343 } // namespace chromeos 1342 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698