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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/chromeos/chromeos_version.h" 13 #include "base/chromeos/chromeos_version.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/file_util.h" 15 #include "base/file_util.h"
16 #include "base/lazy_instance.h" 16 #include "base/lazy_instance.h"
17 #include "base/linux_util.h" 17 #include "base/linux_util.h"
18 #include "base/message_loop.h" 18 #include "base/message_loop.h"
19 #include "base/prefs/pref_service.h"
19 #include "base/string_split.h" 20 #include "base/string_split.h"
20 #include "base/strings/string_number_conversions.h" 21 #include "base/strings/string_number_conversions.h"
21 #include "chrome/browser/browser_process.h" 22 #include "chrome/browser/browser_process.h"
22 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 23 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
23 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 24 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
24 #include "chrome/browser/chromeos/audio/audio_handler.h" 25 #include "chrome/browser/chromeos/audio/audio_handler.h"
25 #include "chrome/browser/chromeos/boot_times_loader.h" 26 #include "chrome/browser/chromeos/boot_times_loader.h"
26 #include "chrome/browser/chromeos/contacts/contact_manager.h" 27 #include "chrome/browser/chromeos/contacts/contact_manager.h"
27 #include "chrome/browser/chromeos/cros/cros_library.h" 28 #include "chrome/browser/chromeos/cros/cros_library.h"
28 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" 29 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #include "chrome/browser/chromeos/settings/owner_key_util.h" 65 #include "chrome/browser/chromeos/settings/owner_key_util.h"
65 #include "chrome/browser/chromeos/system/statistics_provider.h" 66 #include "chrome/browser/chromeos/system/statistics_provider.h"
66 #include "chrome/browser/chromeos/system_key_event_listener.h" 67 #include "chrome/browser/chromeos/system_key_event_listener.h"
67 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" 68 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h"
68 #include "chrome/browser/chromeos/web_socket_proxy_controller.h" 69 #include "chrome/browser/chromeos/web_socket_proxy_controller.h"
69 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h" 70 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
70 #include "chrome/browser/defaults.h" 71 #include "chrome/browser/defaults.h"
71 #include "chrome/browser/metrics/metrics_service.h" 72 #include "chrome/browser/metrics/metrics_service.h"
72 #include "chrome/browser/net/chrome_network_delegate.h" 73 #include "chrome/browser/net/chrome_network_delegate.h"
73 #include "chrome/browser/policy/browser_policy_connector.h" 74 #include "chrome/browser/policy/browser_policy_connector.h"
74 #include "chrome/browser/prefs/pref_service.h"
75 #include "chrome/browser/profiles/profile.h" 75 #include "chrome/browser/profiles/profile.h"
76 #include "chrome/browser/profiles/profile_manager.h" 76 #include "chrome/browser/profiles/profile_manager.h"
77 #include "chrome/browser/rlz/rlz.h" 77 #include "chrome/browser/rlz/rlz.h"
78 #include "chrome/browser/system_monitor/removable_device_notifications_chromeos. h" 78 #include "chrome/browser/system_monitor/removable_device_notifications_chromeos. h"
79 #include "chrome/common/chrome_notification_types.h" 79 #include "chrome/common/chrome_notification_types.h"
80 #include "chrome/common/chrome_switches.h" 80 #include "chrome/common/chrome_switches.h"
81 #include "chrome/common/chrome_version_info.h" 81 #include "chrome/common/chrome_version_info.h"
82 #include "chrome/common/logging_chrome.h" 82 #include "chrome/common/logging_chrome.h"
83 #include "chrome/common/pref_names.h" 83 #include "chrome/common/pref_names.h"
84 #include "chromeos/chromeos_switches.h" 84 #include "chromeos/chromeos_switches.h"
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); 805 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
806 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); 806 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
807 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); 807 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
808 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); 808 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
809 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); 809 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
810 // This is necessary to start the experiment as a side effect. 810 // This is necessary to start the experiment as a side effect.
811 trial->group(); 811 trial->group();
812 } 812 }
813 813
814 } // namespace chromeos 814 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/audio/audio_handler.cc ('k') | chrome/browser/chromeos/customization_document.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698