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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 #include <algorithm> 8 #include <algorithm>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 21 matching lines...) Expand all
32 #include "ash/system/tray_accessibility.h" 32 #include "ash/system/tray_accessibility.h"
33 #include "ash/system/user/login_status.h" 33 #include "ash/system/user/login_status.h"
34 #include "ash/system/user/update_observer.h" 34 #include "ash/system/user/update_observer.h"
35 #include "ash/system/user/user_observer.h" 35 #include "ash/system/user/user_observer.h"
36 #include "ash/volume_control_delegate.h" 36 #include "ash/volume_control_delegate.h"
37 #include "ash/wm/lock_state_controller.h" 37 #include "ash/wm/lock_state_controller.h"
38 #include "base/bind_helpers.h" 38 #include "base/bind_helpers.h"
39 #include "base/callback.h" 39 #include "base/callback.h"
40 #include "base/logging.h" 40 #include "base/logging.h"
41 #include "base/memory/weak_ptr.h" 41 #include "base/memory/weak_ptr.h"
42 #include "base/prefs/pref_service.h"
43 #include "base/strings/stringprintf.h" 42 #include "base/strings/stringprintf.h"
44 #include "base/strings/utf_string_conversions.h" 43 #include "base/strings/utf_string_conversions.h"
45 #include "base/sys_info.h" 44 #include "base/sys_info.h"
46 #include "base/time/time.h" 45 #include "base/time/time.h"
47 #include "chrome/browser/browser_process.h" 46 #include "chrome/browser/browser_process.h"
48 #include "chrome/browser/chrome_notification_types.h" 47 #include "chrome/browser/chrome_notification_types.h"
49 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 48 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
50 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 49 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
51 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h" 50 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h"
52 #include "chrome/browser/chromeos/events/system_key_event_listener.h" 51 #include "chrome/browser/chromeos/events/system_key_event_listener.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 #include "chrome/common/pref_names.h" 90 #include "chrome/common/pref_names.h"
92 #include "chrome/common/url_constants.h" 91 #include "chrome/common/url_constants.h"
93 #include "chrome/grit/generated_resources.h" 92 #include "chrome/grit/generated_resources.h"
94 #include "chrome/grit/locale_settings.h" 93 #include "chrome/grit/locale_settings.h"
95 #include "chromeos/dbus/dbus_thread_manager.h" 94 #include "chromeos/dbus/dbus_thread_manager.h"
96 #include "chromeos/dbus/session_manager_client.h" 95 #include "chromeos/dbus/session_manager_client.h"
97 #include "chromeos/login/login_state.h" 96 #include "chromeos/login/login_state.h"
98 #include "chromeos/network/portal_detector/network_portal_detector.h" 97 #include "chromeos/network/portal_detector/network_portal_detector.h"
99 #include "components/google/core/browser/google_util.h" 98 #include "components/google/core/browser/google_util.h"
100 #include "components/policy/core/common/cloud/cloud_policy_store.h" 99 #include "components/policy/core/common/cloud/cloud_policy_store.h"
100 #include "components/prefs/pref_service.h"
101 #include "components/user_manager/user.h" 101 #include "components/user_manager/user.h"
102 #include "components/user_manager/user_manager.h" 102 #include "components/user_manager/user_manager.h"
103 #include "components/user_manager/user_type.h" 103 #include "components/user_manager/user_type.h"
104 #include "content/public/browser/notification_observer.h" 104 #include "content/public/browser/notification_observer.h"
105 #include "content/public/browser/notification_service.h" 105 #include "content/public/browser/notification_service.h"
106 #include "content/public/browser/user_metrics.h" 106 #include "content/public/browser/user_metrics.h"
107 #include "content/public/browser/web_contents.h" 107 #include "content/public/browser/web_contents.h"
108 #include "device/bluetooth/bluetooth_adapter.h" 108 #include "device/bluetooth/bluetooth_adapter.h"
109 #include "device/bluetooth/bluetooth_adapter_factory.h" 109 #include "device/bluetooth/bluetooth_adapter_factory.h"
110 #include "device/bluetooth/bluetooth_device.h" 110 #include "device/bluetooth/bluetooth_device.h"
(...skipping 1217 matching lines...) Expand 10 before | Expand all | Expand 10 after
1328 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " 1328 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
1329 << "ENABLE_SUPERVISED_USERS undefined."; 1329 << "ENABLE_SUPERVISED_USERS undefined.";
1330 return base::string16(); 1330 return base::string16();
1331 } 1331 }
1332 1332
1333 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1333 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1334 return new SystemTrayDelegateChromeOS(); 1334 return new SystemTrayDelegateChromeOS();
1335 } 1335 }
1336 1336
1337 } // namespace chromeos 1337 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698