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

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

Issue 7019039: [cros] Move carrier deal shown property to LocalState. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 #endif 70 #endif
71 71
72 #if defined(OS_CHROMEOS) 72 #if defined(OS_CHROMEOS)
73 #include "chrome/browser/chromeos/audio_mixer_alsa.h" 73 #include "chrome/browser/chromeos/audio_mixer_alsa.h"
74 #include "chrome/browser/chromeos/customization_document.h" 74 #include "chrome/browser/chromeos/customization_document.h"
75 #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h" 75 #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h"
76 #include "chrome/browser/chromeos/login/user_manager.h" 76 #include "chrome/browser/chromeos/login/user_manager.h"
77 #include "chrome/browser/chromeos/login/wizard_controller.h" 77 #include "chrome/browser/chromeos/login/wizard_controller.h"
78 #include "chrome/browser/chromeos/preferences.h" 78 #include "chrome/browser/chromeos/preferences.h"
79 #include "chrome/browser/chromeos/status/input_method_menu.h" 79 #include "chrome/browser/chromeos/status/input_method_menu.h"
80 #include "chrome/browser/chromeos/status/network_menu_button.h"
80 #include "chrome/browser/chromeos/user_cros_settings_provider.h" 81 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
81 #endif 82 #endif
82 83
83 namespace browser { 84 namespace browser {
84 85
85 void RegisterLocalState(PrefService* local_state) { 86 void RegisterLocalState(PrefService* local_state) {
86 // Prefs in Local State 87 // Prefs in Local State
87 AppsPromo::RegisterPrefs(local_state); 88 AppsPromo::RegisterPrefs(local_state);
88 Browser::RegisterPrefs(local_state); 89 Browser::RegisterPrefs(local_state);
89 FlagsUI::RegisterPrefs(local_state); 90 FlagsUI::RegisterPrefs(local_state);
(...skipping 21 matching lines...) Expand all
111 policy::CloudPolicySubsystem::RegisterPrefs(local_state); 112 policy::CloudPolicySubsystem::RegisterPrefs(local_state);
112 ProfileManager::RegisterPrefs(local_state); 113 ProfileManager::RegisterPrefs(local_state);
113 #if defined(OS_CHROMEOS) 114 #if defined(OS_CHROMEOS)
114 chromeos::AudioMixerAlsa::RegisterPrefs(local_state); 115 chromeos::AudioMixerAlsa::RegisterPrefs(local_state);
115 chromeos::UserManager::RegisterPrefs(local_state); 116 chromeos::UserManager::RegisterPrefs(local_state);
116 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state); 117 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state);
117 WizardController::RegisterPrefs(local_state); 118 WizardController::RegisterPrefs(local_state);
118 chromeos::InputMethodMenu::RegisterPrefs(local_state); 119 chromeos::InputMethodMenu::RegisterPrefs(local_state);
119 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); 120 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state);
120 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state); 121 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state);
122 chromeos::NetworkMenuButton::RegisterPrefs(local_state);
121 #endif 123 #endif
122 } 124 }
123 125
124 void RegisterUserPrefs(PrefService* user_prefs) { 126 void RegisterUserPrefs(PrefService* user_prefs) {
125 // User prefs 127 // User prefs
126 AppsPromo::RegisterUserPrefs(user_prefs); 128 AppsPromo::RegisterUserPrefs(user_prefs);
127 AutofillManager::RegisterUserPrefs(user_prefs); 129 AutofillManager::RegisterUserPrefs(user_prefs);
128 SessionStartupPref::RegisterUserPrefs(user_prefs); 130 SessionStartupPref::RegisterUserPrefs(user_prefs);
129 Browser::RegisterUserPrefs(user_prefs); 131 Browser::RegisterUserPrefs(user_prefs);
130 PasswordManager::RegisterUserPrefs(user_prefs); 132 PasswordManager::RegisterUserPrefs(user_prefs);
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); 194 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue()));
193 } 195 }
194 local_state->ClearPref(prefs::kBrowserWindowPlacement); 196 local_state->ClearPref(prefs::kBrowserWindowPlacement);
195 197
196 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 198 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
197 current_version | WINDOWS_PREFS); 199 current_version | WINDOWS_PREFS);
198 } 200 }
199 } 201 }
200 202
201 } // namespace browser 203 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698