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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 #if defined(USE_AURA) | 97 #if defined(USE_AURA) |
98 #include "chrome/browser/ui/views/aura/launcher/chrome_launcher_delegate.h" | 98 #include "chrome/browser/ui/views/aura/launcher/chrome_launcher_delegate.h" |
99 #endif | 99 #endif |
| 100 #include "chrome/browser/gesture_prefs.h" |
100 | 101 |
101 namespace browser { | 102 namespace browser { |
102 | 103 |
103 void RegisterLocalState(PrefService* local_state) { | 104 void RegisterLocalState(PrefService* local_state) { |
104 // Prefs in Local State | 105 // Prefs in Local State |
105 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); | 106 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); |
106 AppsPromo::RegisterPrefs(local_state); | 107 AppsPromo::RegisterPrefs(local_state); |
107 Browser::RegisterPrefs(local_state); | 108 Browser::RegisterPrefs(local_state); |
108 FlagsUI::RegisterPrefs(local_state); | 109 FlagsUI::RegisterPrefs(local_state); |
109 WebCacheManager::RegisterPrefs(local_state); | 110 WebCacheManager::RegisterPrefs(local_state); |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 chromeos::UserManager::RegisterPrefs(local_state); | 146 chromeos::UserManager::RegisterPrefs(local_state); |
146 chromeos::WizardController::RegisterPrefs(local_state); | 147 chromeos::WizardController::RegisterPrefs(local_state); |
147 chromeos::InputMethodMenu::RegisterPrefs(local_state); | 148 chromeos::InputMethodMenu::RegisterPrefs(local_state); |
148 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); | 149 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); |
149 chromeos::signed_settings_cache::RegisterPrefs(local_state); | 150 chromeos::signed_settings_cache::RegisterPrefs(local_state); |
150 chromeos::NetworkMenuButton::RegisterPrefs(local_state); | 151 chromeos::NetworkMenuButton::RegisterPrefs(local_state); |
151 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); | 152 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); |
152 policy::AutoEnrollmentClient::RegisterPrefs(local_state); | 153 policy::AutoEnrollmentClient::RegisterPrefs(local_state); |
153 policy::DeviceStatusCollector::RegisterPrefs(local_state); | 154 policy::DeviceStatusCollector::RegisterPrefs(local_state); |
154 #endif | 155 #endif |
| 156 GesturePrefs::RegisterPrefs(local_state); |
155 } | 157 } |
156 | 158 |
157 void RegisterUserPrefs(PrefService* user_prefs) { | 159 void RegisterUserPrefs(PrefService* user_prefs) { |
158 // User prefs | 160 // User prefs |
159 AppsPromo::RegisterUserPrefs(user_prefs); | 161 AppsPromo::RegisterUserPrefs(user_prefs); |
160 AutofillManager::RegisterUserPrefs(user_prefs); | 162 AutofillManager::RegisterUserPrefs(user_prefs); |
161 SessionStartupPref::RegisterUserPrefs(user_prefs); | 163 SessionStartupPref::RegisterUserPrefs(user_prefs); |
162 BookmarkModel::RegisterUserPrefs(user_prefs); | 164 BookmarkModel::RegisterUserPrefs(user_prefs); |
163 Browser::RegisterUserPrefs(user_prefs); | 165 Browser::RegisterUserPrefs(user_prefs); |
164 BrowserInit::RegisterUserPrefs(user_prefs); | 166 BrowserInit::RegisterUserPrefs(user_prefs); |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
239 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 241 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
240 } | 242 } |
241 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 243 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
242 | 244 |
243 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 245 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
244 current_version | WINDOWS_PREFS); | 246 current_version | WINDOWS_PREFS); |
245 } | 247 } |
246 } | 248 } |
247 | 249 |
248 } // namespace browser | 250 } // namespace browser |
OLD | NEW |