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

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

Issue 9460001: Adding persistance for gesture recognition parms. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 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 (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/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/background_mode_manager.h" 9 #include "chrome/browser/background/background_mode_manager.h"
10 #include "chrome/browser/bookmarks/bookmark_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 #include "chrome/browser/chromeos/preferences.h" 87 #include "chrome/browser/chromeos/preferences.h"
88 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 88 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
89 #include "chrome/browser/chromeos/status/input_method_menu.h" 89 #include "chrome/browser/chromeos/status/input_method_menu.h"
90 #include "chrome/browser/chromeos/status/network_menu_button.h" 90 #include "chrome/browser/chromeos/status/network_menu_button.h"
91 #include "chrome/browser/policy/auto_enrollment_client.h" 91 #include "chrome/browser/policy/auto_enrollment_client.h"
92 #include "chrome/browser/policy/device_status_collector.h" 92 #include "chrome/browser/policy/device_status_collector.h"
93 #else 93 #else
94 #include "chrome/browser/extensions/default_apps.h" 94 #include "chrome/browser/extensions/default_apps.h"
95 #endif 95 #endif
96 96
97 #include "chrome/browser/gesture_prefs.h"
rjkroege 2012/02/24 15:21:34 this should not hang on its lonesome here but sort
98
97 namespace browser { 99 namespace browser {
98 100
99 void RegisterLocalState(PrefService* local_state) { 101 void RegisterLocalState(PrefService* local_state) {
100 // Prefs in Local State 102 // Prefs in Local State
101 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); 103 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);
102 AppsPromo::RegisterPrefs(local_state); 104 AppsPromo::RegisterPrefs(local_state);
103 Browser::RegisterPrefs(local_state); 105 Browser::RegisterPrefs(local_state);
104 FlagsUI::RegisterPrefs(local_state); 106 FlagsUI::RegisterPrefs(local_state);
105 WebCacheManager::RegisterPrefs(local_state); 107 WebCacheManager::RegisterPrefs(local_state);
106 ExternalProtocolHandler::RegisterPrefs(local_state); 108 ExternalProtocolHandler::RegisterPrefs(local_state);
(...skipping 30 matching lines...) Expand all
137 chromeos::UserManager::RegisterPrefs(local_state); 139 chromeos::UserManager::RegisterPrefs(local_state);
138 chromeos::WizardController::RegisterPrefs(local_state); 140 chromeos::WizardController::RegisterPrefs(local_state);
139 chromeos::InputMethodMenu::RegisterPrefs(local_state); 141 chromeos::InputMethodMenu::RegisterPrefs(local_state);
140 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); 142 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state);
141 chromeos::signed_settings_cache::RegisterPrefs(local_state); 143 chromeos::signed_settings_cache::RegisterPrefs(local_state);
142 chromeos::NetworkMenuButton::RegisterPrefs(local_state); 144 chromeos::NetworkMenuButton::RegisterPrefs(local_state);
143 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); 145 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state);
144 policy::AutoEnrollmentClient::RegisterPrefs(local_state); 146 policy::AutoEnrollmentClient::RegisterPrefs(local_state);
145 policy::DeviceStatusCollector::RegisterPrefs(local_state); 147 policy::DeviceStatusCollector::RegisterPrefs(local_state);
146 #endif 148 #endif
149 #if defined(USE_AURA)
rjkroege 2012/02/24 15:21:34 you have coded it in the other place to be harmles
150 GesturePrefsHelper::RegisterPrefs(local_state);
151 #endif
147 } 152 }
148 153
149 void RegisterUserPrefs(PrefService* user_prefs) { 154 void RegisterUserPrefs(PrefService* user_prefs) {
150 // User prefs 155 // User prefs
151 AppsPromo::RegisterUserPrefs(user_prefs); 156 AppsPromo::RegisterUserPrefs(user_prefs);
152 AutofillManager::RegisterUserPrefs(user_prefs); 157 AutofillManager::RegisterUserPrefs(user_prefs);
153 SessionStartupPref::RegisterUserPrefs(user_prefs); 158 SessionStartupPref::RegisterUserPrefs(user_prefs);
154 BookmarkModel::RegisterUserPrefs(user_prefs); 159 BookmarkModel::RegisterUserPrefs(user_prefs);
155 Browser::RegisterUserPrefs(user_prefs); 160 Browser::RegisterUserPrefs(user_prefs);
156 BrowserInit::RegisterUserPrefs(user_prefs); 161 BrowserInit::RegisterUserPrefs(user_prefs);
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); 231 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue()));
227 } 232 }
228 local_state->ClearPref(prefs::kBrowserWindowPlacement); 233 local_state->ClearPref(prefs::kBrowserWindowPlacement);
229 234
230 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 235 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
231 current_version | WINDOWS_PREFS); 236 current_version | WINDOWS_PREFS);
232 } 237 }
233 } 238 }
234 239
235 } // namespace browser 240 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698