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

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

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 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "ash/session/session_state_observer.h" 13 #include "ash/session/session_state_observer.h"
14 #include "ash/system/chromeos/supervised/custodian_info_tray_observer.h" 14 #include "ash/system/chromeos/supervised/custodian_info_tray_observer.h"
15 #include "ash/system/tray/system_tray.h" 15 #include "ash/system/tray/system_tray.h"
16 #include "ash/system/tray/system_tray_delegate.h" 16 #include "ash/system/tray/system_tray_delegate.h"
17 #include "ash/system/tray/system_tray_notifier.h" 17 #include "ash/system/tray/system_tray_notifier.h"
18 #include "base/callback_forward.h" 18 #include "base/callback_forward.h"
19 #include "base/callback_list.h" 19 #include "base/callback_list.h"
20 #include "base/compiler_specific.h" 20 #include "base/compiler_specific.h"
21 #include "base/macros.h" 21 #include "base/macros.h"
22 #include "base/memory/ref_counted.h" 22 #include "base/memory/ref_counted.h"
23 #include "base/memory/weak_ptr.h" 23 #include "base/memory/weak_ptr.h"
24 #include "base/observer_list.h" 24 #include "base/observer_list.h"
25 #include "base/prefs/pref_change_registrar.h"
26 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 25 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
27 #include "chrome/browser/chromeos/settings/shutdown_policy_handler.h" 26 #include "chrome/browser/chromeos/settings/shutdown_policy_handler.h"
28 #include "chrome/browser/chromeos/system/system_clock.h" 27 #include "chrome/browser/chromeos/system/system_clock.h"
29 #include "chrome/browser/chromeos/system/system_clock_observer.h" 28 #include "chrome/browser/chromeos/system/system_clock_observer.h"
30 #include "chrome/browser/profiles/profile.h" 29 #include "chrome/browser/profiles/profile.h"
31 #include "chrome/browser/supervised_user/supervised_user_service_observer.h" 30 #include "chrome/browser/supervised_user/supervised_user_service_observer.h"
32 #include "chrome/browser/ui/browser_list_observer.h" 31 #include "chrome/browser/ui/browser_list_observer.h"
33 #include "chromeos/audio/cras_audio_handler.h" 32 #include "chromeos/audio/cras_audio_handler.h"
34 #include "chromeos/dbus/session_manager_client.h" 33 #include "chromeos/dbus/session_manager_client.h"
35 #include "components/policy/core/common/cloud/cloud_policy_store.h" 34 #include "components/policy/core/common/cloud/cloud_policy_store.h"
35 #include "components/prefs/pref_change_registrar.h"
36 #include "components/signin/core/account_id/account_id.h" 36 #include "components/signin/core/account_id/account_id.h"
37 #include "components/user_manager/user_manager.h" 37 #include "components/user_manager/user_manager.h"
38 #include "content/public/browser/notification_observer.h" 38 #include "content/public/browser/notification_observer.h"
39 #include "content/public/browser/notification_registrar.h" 39 #include "content/public/browser/notification_registrar.h"
40 #include "device/bluetooth/bluetooth_adapter.h" 40 #include "device/bluetooth/bluetooth_adapter.h"
41 #include "device/bluetooth/bluetooth_discovery_session.h" 41 #include "device/bluetooth/bluetooth_discovery_session.h"
42 #include "extensions/browser/app_window/app_window_registry.h" 42 #include "extensions/browser/app_window/app_window_registry.h"
43 #include "ui/base/ime/chromeos/input_method_manager.h" 43 #include "ui/base/ime/chromeos/input_method_manager.h"
44 #include "ui/chromeos/ime/input_method_menu_manager.h" 44 #include "ui/chromeos/ime/input_method_menu_manager.h"
45 45
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 304
305 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 305 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
306 306
307 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 307 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
308 }; 308 };
309 309
310 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 310 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
311 311
312 } // namespace chromeos 312 } // namespace chromeos
313 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 313 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/session_state_delegate_chromeos.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698