OLD | NEW |
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 Loading... |
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" |
55 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 56 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
56 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 57 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
57 #include "chrome/browser/ui/webui/flags_ui.h" | 58 #include "chrome/browser/ui/webui/flags_ui.h" |
58 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" | 59 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" |
59 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 60 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
60 #include "chrome/browser/ui/webui/options/extension_settings_handler.h" | 61 #include "chrome/browser/ui/webui/options/extension_settings_handler.h" |
61 #include "chrome/browser/ui/webui/plugins_ui.h" | 62 #include "chrome/browser/ui/webui/plugins_ui.h" |
62 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" | 63 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" |
63 #include "chrome/browser/upgrade_detector.h" | 64 #include "chrome/browser/upgrade_detector.h" |
64 #include "chrome/browser/web_resource/promo_resource_service.h" | 65 #include "chrome/browser/web_resource/promo_resource_service.h" |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); | 154 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); |
154 chromeos::signed_settings_cache::RegisterPrefs(local_state); | 155 chromeos::signed_settings_cache::RegisterPrefs(local_state); |
155 chromeos::WizardController::RegisterPrefs(local_state); | 156 chromeos::WizardController::RegisterPrefs(local_state); |
156 policy::AutoEnrollmentClient::RegisterPrefs(local_state); | 157 policy::AutoEnrollmentClient::RegisterPrefs(local_state); |
157 policy::DeviceStatusCollector::RegisterPrefs(local_state); | 158 policy::DeviceStatusCollector::RegisterPrefs(local_state); |
158 #endif | 159 #endif |
159 | 160 |
160 #if defined(OS_MACOSX) | 161 #if defined(OS_MACOSX) |
161 confirm_quit::RegisterLocalState(local_state); | 162 confirm_quit::RegisterLocalState(local_state); |
162 #endif | 163 #endif |
| 164 |
| 165 GesturePrefsRegisterPrefs(local_state); |
163 } | 166 } |
164 | 167 |
165 void RegisterUserPrefs(PrefService* user_prefs) { | 168 void RegisterUserPrefs(PrefService* user_prefs) { |
166 // User prefs | 169 // User prefs |
167 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); | 170 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); |
168 AppsPromo::RegisterUserPrefs(user_prefs); | 171 AppsPromo::RegisterUserPrefs(user_prefs); |
169 AutofillManager::RegisterUserPrefs(user_prefs); | 172 AutofillManager::RegisterUserPrefs(user_prefs); |
170 bookmark_utils::RegisterUserPrefs(user_prefs); | 173 bookmark_utils::RegisterUserPrefs(user_prefs); |
171 BookmarkModel::RegisterUserPrefs(user_prefs); | 174 BookmarkModel::RegisterUserPrefs(user_prefs); |
172 Browser::RegisterUserPrefs(user_prefs); | 175 Browser::RegisterUserPrefs(user_prefs); |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 258 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
256 } | 259 } |
257 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 260 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
258 | 261 |
259 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 262 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
260 current_version | WINDOWS_PREFS); | 263 current_version | WINDOWS_PREFS); |
261 } | 264 } |
262 } | 265 } |
263 | 266 |
264 } // namespace browser | 267 } // namespace browser |
OLD | NEW |