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

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 6893052: Make customization documents singletons. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments resolved Created 9 years, 8 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include "chrome/browser/about_flags.h" 7 #include "chrome/browser/about_flags.h"
8 #include "chrome/browser/autofill/autofill_manager.h" 8 #include "chrome/browser/autofill/autofill_manager.h"
9 #include "chrome/browser/background_contents_service.h" 9 #include "chrome/browser/background_contents_service.h"
10 #include "chrome/browser/background_mode_manager.h" 10 #include "chrome/browser/background_mode_manager.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 #include "chrome/browser/ui/views/browser_actions_container.h" 63 #include "chrome/browser/ui/views/browser_actions_container.h"
64 #include "chrome/browser/ui/views/frame/browser_view.h" 64 #include "chrome/browser/ui/views/frame/browser_view.h"
65 #endif 65 #endif
66 66
67 #if defined(TOOLKIT_GTK) 67 #if defined(TOOLKIT_GTK)
68 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 68 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
69 #endif 69 #endif
70 70
71 #if defined(OS_CHROMEOS) 71 #if defined(OS_CHROMEOS)
72 #include "chrome/browser/chromeos/audio_mixer_alsa.h" 72 #include "chrome/browser/chromeos/audio_mixer_alsa.h"
73 #include "chrome/browser/chromeos/login/apply_services_customization.h" 73 #include "chrome/browser/chromeos/customization_document.h"
74 #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h" 74 #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h"
75 #include "chrome/browser/chromeos/login/user_manager.h" 75 #include "chrome/browser/chromeos/login/user_manager.h"
76 #include "chrome/browser/chromeos/login/wizard_controller.h" 76 #include "chrome/browser/chromeos/login/wizard_controller.h"
77 #include "chrome/browser/chromeos/preferences.h" 77 #include "chrome/browser/chromeos/preferences.h"
78 #include "chrome/browser/chromeos/status/input_method_menu.h" 78 #include "chrome/browser/chromeos/status/input_method_menu.h"
79 #include "chrome/browser/chromeos/user_cros_settings_provider.h" 79 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
80 #endif 80 #endif
81 81
82 namespace browser { 82 namespace browser {
83 83
(...skipping 24 matching lines...) Expand all
108 BackgroundPageTracker::RegisterPrefs(local_state); 108 BackgroundPageTracker::RegisterPrefs(local_state);
109 NotificationUIManager::RegisterPrefs(local_state); 109 NotificationUIManager::RegisterPrefs(local_state);
110 PrefProxyConfigService::RegisterPrefs(local_state); 110 PrefProxyConfigService::RegisterPrefs(local_state);
111 policy::CloudPolicySubsystem::RegisterPrefs(local_state); 111 policy::CloudPolicySubsystem::RegisterPrefs(local_state);
112 #if defined(OS_CHROMEOS) 112 #if defined(OS_CHROMEOS)
113 chromeos::AudioMixerAlsa::RegisterPrefs(local_state); 113 chromeos::AudioMixerAlsa::RegisterPrefs(local_state);
114 chromeos::UserManager::RegisterPrefs(local_state); 114 chromeos::UserManager::RegisterPrefs(local_state);
115 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state); 115 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state);
116 WizardController::RegisterPrefs(local_state); 116 WizardController::RegisterPrefs(local_state);
117 chromeos::InputMethodMenu::RegisterPrefs(local_state); 117 chromeos::InputMethodMenu::RegisterPrefs(local_state);
118 chromeos::ApplyServicesCustomization::RegisterPrefs(local_state); 118 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state);
119 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state); 119 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state);
120 #endif 120 #endif
121 } 121 }
122 122
123 void RegisterUserPrefs(PrefService* user_prefs) { 123 void RegisterUserPrefs(PrefService* user_prefs) {
124 // User prefs 124 // User prefs
125 AppsPromo::RegisterUserPrefs(user_prefs); 125 AppsPromo::RegisterUserPrefs(user_prefs);
126 AutofillManager::RegisterUserPrefs(user_prefs); 126 AutofillManager::RegisterUserPrefs(user_prefs);
127 SessionStartupPref::RegisterUserPrefs(user_prefs); 127 SessionStartupPref::RegisterUserPrefs(user_prefs);
128 Browser::RegisterUserPrefs(user_prefs); 128 Browser::RegisterUserPrefs(user_prefs);
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); 190 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue()));
191 } 191 }
192 local_state->ClearPref(prefs::kBrowserWindowPlacement); 192 local_state->ClearPref(prefs::kBrowserWindowPlacement);
193 193
194 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 194 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
195 current_version | WINDOWS_PREFS); 195 current_version | WINDOWS_PREFS);
196 } 196 }
197 } 197 }
198 198
199 } // namespace browser 199 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | chrome/browser/ui/webui/chromeos/register_page_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698