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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/status/data_promo_notification.cc ('k') | chrome/browser/chromeos/system/tray_accessibility_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/chromeos/system/ash_system_tray_delegate.h" 5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 16 matching lines...) Expand all
27 #include "ash/system/user/update_observer.h" 27 #include "ash/system/user/update_observer.h"
28 #include "ash/system/user/user_observer.h" 28 #include "ash/system/user/user_observer.h"
29 #include "ash/volume_control_delegate.h" 29 #include "ash/volume_control_delegate.h"
30 #include "ash/wm/session_state_controller.h" 30 #include "ash/wm/session_state_controller.h"
31 #include "base/bind_helpers.h" 31 #include "base/bind_helpers.h"
32 #include "base/callback.h" 32 #include "base/callback.h"
33 #include "base/chromeos/chromeos_version.h" 33 #include "base/chromeos/chromeos_version.h"
34 #include "base/command_line.h" 34 #include "base/command_line.h"
35 #include "base/logging.h" 35 #include "base/logging.h"
36 #include "base/memory/weak_ptr.h" 36 #include "base/memory/weak_ptr.h"
37 #include "base/prefs/pref_service.h"
37 #include "base/prefs/public/pref_service_base.h" 38 #include "base/prefs/public/pref_service_base.h"
38 #include "base/time.h" 39 #include "base/time.h"
39 #include "base/utf_string_conversions.h" 40 #include "base/utf_string_conversions.h"
40 #include "chrome/browser/browser_process.h" 41 #include "chrome/browser/browser_process.h"
41 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 42 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
42 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 43 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
43 #include "chrome/browser/chromeos/audio/audio_handler.h" 44 #include "chrome/browser/chromeos/audio/audio_handler.h"
44 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h" 45 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h"
45 #include "chrome/browser/chromeos/cros/cros_library.h" 46 #include "chrome/browser/chromeos/cros/cros_library.h"
46 #include "chrome/browser/chromeos/cros/network_library.h" 47 #include "chrome/browser/chromeos/cros/network_library.h"
(...skipping 14 matching lines...) Expand all
61 #include "chrome/browser/chromeos/status/network_menu.h" 62 #include "chrome/browser/chromeos/status/network_menu.h"
62 #include "chrome/browser/chromeos/status/network_menu_icon.h" 63 #include "chrome/browser/chromeos/status/network_menu_icon.h"
63 #include "chrome/browser/chromeos/system/timezone_settings.h" 64 #include "chrome/browser/chromeos/system/timezone_settings.h"
64 #include "chrome/browser/chromeos/system_key_event_listener.h" 65 #include "chrome/browser/chromeos/system_key_event_listener.h"
65 #include "chrome/browser/google/google_util.h" 66 #include "chrome/browser/google/google_util.h"
66 #include "chrome/browser/google_apis/drive_service_interface.h" 67 #include "chrome/browser/google_apis/drive_service_interface.h"
67 #include "chrome/browser/lifetime/application_lifetime.h" 68 #include "chrome/browser/lifetime/application_lifetime.h"
68 #include "chrome/browser/policy/browser_policy_connector.h" 69 #include "chrome/browser/policy/browser_policy_connector.h"
69 #include "chrome/browser/policy/cloud_policy_store.h" 70 #include "chrome/browser/policy/cloud_policy_store.h"
70 #include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h" 71 #include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h"
71 #include "chrome/browser/prefs/pref_service.h"
72 #include "chrome/browser/profiles/profile_manager.h" 72 #include "chrome/browser/profiles/profile_manager.h"
73 #include "chrome/browser/ui/ash/volume_controller_chromeos.h" 73 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
74 #include "chrome/browser/ui/browser.h" 74 #include "chrome/browser/ui/browser.h"
75 #include "chrome/browser/ui/browser_finder.h" 75 #include "chrome/browser/ui/browser_finder.h"
76 #include "chrome/browser/ui/chrome_pages.h" 76 #include "chrome/browser/ui/chrome_pages.h"
77 #include "chrome/browser/ui/host_desktop.h" 77 #include "chrome/browser/ui/host_desktop.h"
78 #include "chrome/browser/ui/singleton_tabs.h" 78 #include "chrome/browser/ui/singleton_tabs.h"
79 #include "chrome/browser/upgrade_detector.h" 79 #include "chrome/browser/upgrade_detector.h"
80 #include "chrome/common/chrome_notification_types.h" 80 #include "chrome/common/chrome_notification_types.h"
81 #include "chrome/common/pref_names.h" 81 #include "chrome/common/pref_names.h"
(...skipping 1346 matching lines...) Expand 10 before | Expand all | Expand 10 after
1428 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1428 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1429 }; 1429 };
1430 1430
1431 } // namespace 1431 } // namespace
1432 1432
1433 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1433 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1434 return new chromeos::SystemTrayDelegate(); 1434 return new chromeos::SystemTrayDelegate();
1435 } 1435 }
1436 1436
1437 } // namespace chromeos 1437 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/data_promo_notification.cc ('k') | chrome/browser/chromeos/system/tray_accessibility_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698