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

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

Issue 9562013: Revert 124433 - Adding persistance for gesture recognition parms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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 | « no previous file | chrome/browser/ui/gesture_prefs.h » ('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/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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #include "chrome/browser/profiles/profile_manager.h" 45 #include "chrome/browser/profiles/profile_manager.h"
46 #include "chrome/browser/renderer_host/web_cache_manager.h" 46 #include "chrome/browser/renderer_host/web_cache_manager.h"
47 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 47 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
48 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 48 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
49 #include "chrome/browser/tabs/pinned_tab_codec.h" 49 #include "chrome/browser/tabs/pinned_tab_codec.h"
50 #include "chrome/browser/task_manager/task_manager.h" 50 #include "chrome/browser/task_manager/task_manager.h"
51 #include "chrome/browser/translate/translate_prefs.h" 51 #include "chrome/browser/translate/translate_prefs.h"
52 #include "chrome/browser/ui/alternate_error_tab_observer.h" 52 #include "chrome/browser/ui/alternate_error_tab_observer.h"
53 #include "chrome/browser/ui/browser.h" 53 #include "chrome/browser/ui/browser.h"
54 #include "chrome/browser/ui/browser_init.h" 54 #include "chrome/browser/ui/browser_init.h"
55 #include "chrome/browser/ui/gesture_prefs.h"
56 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 55 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
57 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 56 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
58 #include "chrome/browser/ui/webui/flags_ui.h" 57 #include "chrome/browser/ui/webui/flags_ui.h"
59 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" 58 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h"
60 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 59 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
61 #include "chrome/browser/ui/webui/options/extension_settings_handler.h" 60 #include "chrome/browser/ui/webui/options/extension_settings_handler.h"
62 #include "chrome/browser/ui/webui/plugins_ui.h" 61 #include "chrome/browser/ui/webui/plugins_ui.h"
63 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" 62 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
64 #include "chrome/browser/upgrade_detector.h" 63 #include "chrome/browser/upgrade_detector.h"
65 #include "chrome/browser/web_resource/promo_resource_service.h" 64 #include "chrome/browser/web_resource/promo_resource_service.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); 153 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state);
155 chromeos::signed_settings_cache::RegisterPrefs(local_state); 154 chromeos::signed_settings_cache::RegisterPrefs(local_state);
156 chromeos::WizardController::RegisterPrefs(local_state); 155 chromeos::WizardController::RegisterPrefs(local_state);
157 policy::AutoEnrollmentClient::RegisterPrefs(local_state); 156 policy::AutoEnrollmentClient::RegisterPrefs(local_state);
158 policy::DeviceStatusCollector::RegisterPrefs(local_state); 157 policy::DeviceStatusCollector::RegisterPrefs(local_state);
159 #endif 158 #endif
160 159
161 #if defined(OS_MACOSX) 160 #if defined(OS_MACOSX)
162 confirm_quit::RegisterLocalState(local_state); 161 confirm_quit::RegisterLocalState(local_state);
163 #endif 162 #endif
164
165 GesturePrefsRegisterPrefs(local_state);
166 } 163 }
167 164
168 void RegisterUserPrefs(PrefService* user_prefs) { 165 void RegisterUserPrefs(PrefService* user_prefs) {
169 // User prefs 166 // User prefs
170 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); 167 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs);
171 AppsPromo::RegisterUserPrefs(user_prefs); 168 AppsPromo::RegisterUserPrefs(user_prefs);
172 AutofillManager::RegisterUserPrefs(user_prefs); 169 AutofillManager::RegisterUserPrefs(user_prefs);
173 bookmark_utils::RegisterUserPrefs(user_prefs); 170 bookmark_utils::RegisterUserPrefs(user_prefs);
174 BookmarkModel::RegisterUserPrefs(user_prefs); 171 BookmarkModel::RegisterUserPrefs(user_prefs);
175 Browser::RegisterUserPrefs(user_prefs); 172 Browser::RegisterUserPrefs(user_prefs);
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); 255 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue()));
259 } 256 }
260 local_state->ClearPref(prefs::kBrowserWindowPlacement); 257 local_state->ClearPref(prefs::kBrowserWindowPlacement);
261 258
262 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 259 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
263 current_version | WINDOWS_PREFS); 260 current_version | WINDOWS_PREFS);
264 } 261 }
265 } 262 }
266 263
267 } // namespace browser 264 } // namespace browser
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/gesture_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698