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

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

Issue 12207104: Refactor app_list_util.h into AppListService abstract base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase (conflicts in webstore_private_api.cc) Created 7 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "apps/prefs.h" 7 #include "apps/prefs.h"
8 #include "base/prefs/pref_registry_simple.h" 8 #include "base/prefs/pref_registry_simple.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/about_flags.h" 10 #include "chrome/browser/about_flags.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 #include "chrome/browser/profiles/profile_info_cache.h" 62 #include "chrome/browser/profiles/profile_info_cache.h"
63 #include "chrome/browser/profiles/profile_manager.h" 63 #include "chrome/browser/profiles/profile_manager.h"
64 #include "chrome/browser/renderer_host/web_cache_manager.h" 64 #include "chrome/browser/renderer_host/web_cache_manager.h"
65 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 65 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
66 #include "chrome/browser/signin/signin_manager_factory.h" 66 #include "chrome/browser/signin/signin_manager_factory.h"
67 #include "chrome/browser/sync/invalidations/invalidator_storage.h" 67 #include "chrome/browser/sync/invalidations/invalidator_storage.h"
68 #include "chrome/browser/sync/sync_prefs.h" 68 #include "chrome/browser/sync/sync_prefs.h"
69 #include "chrome/browser/task_manager/task_manager.h" 69 #include "chrome/browser/task_manager/task_manager.h"
70 #include "chrome/browser/translate/translate_prefs.h" 70 #include "chrome/browser/translate/translate_prefs.h"
71 #include "chrome/browser/ui/alternate_error_tab_observer.h" 71 #include "chrome/browser/ui/alternate_error_tab_observer.h"
72 #include "chrome/browser/ui/app_list/app_list_util.h" 72 #include "chrome/browser/ui/app_list/app_list_service.h"
73 #include "chrome/browser/ui/browser_instant_controller.h" 73 #include "chrome/browser/ui/browser_instant_controller.h"
74 #include "chrome/browser/ui/browser_ui_prefs.h" 74 #include "chrome/browser/ui/browser_ui_prefs.h"
75 #include "chrome/browser/ui/network_profile_bubble.h" 75 #include "chrome/browser/ui/network_profile_bubble.h"
76 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 76 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
77 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 77 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
78 #include "chrome/browser/ui/startup/autolaunch_prompt.h" 78 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
79 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 79 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
80 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" 80 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
81 #include "chrome/browser/ui/webui/flags_ui.h" 81 #include "chrome/browser/ui/webui/flags_ui.h"
82 #include "chrome/browser/ui/webui/instant_ui.h" 82 #include "chrome/browser/ui/webui/instant_ui.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 165
166 } // namespace 166 } // namespace
167 167
168 namespace chrome { 168 namespace chrome {
169 169
170 void RegisterLocalState(PrefRegistrySimple* registry) { 170 void RegisterLocalState(PrefRegistrySimple* registry) {
171 // Prefs in Local State. 171 // Prefs in Local State.
172 registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); 172 registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);
173 173
174 // Please keep this list alphabetized. 174 // Please keep this list alphabetized.
175 AppListService::RegisterPrefs(registry);
175 apps::RegisterPrefs(registry); 176 apps::RegisterPrefs(registry);
176 browser_shutdown::RegisterPrefs(registry); 177 browser_shutdown::RegisterPrefs(registry);
177 BrowserProcessImpl::RegisterPrefs(registry); 178 BrowserProcessImpl::RegisterPrefs(registry);
178 chrome::RegisterScreenshotPrefs(registry); 179 chrome::RegisterScreenshotPrefs(registry);
179 ExternalProtocolHandler::RegisterPrefs(registry); 180 ExternalProtocolHandler::RegisterPrefs(registry);
180 FlagsUI::RegisterPrefs(registry); 181 FlagsUI::RegisterPrefs(registry);
181 geolocation::RegisterPrefs(registry); 182 geolocation::RegisterPrefs(registry);
182 GLStringManager::RegisterPrefs(registry); 183 GLStringManager::RegisterPrefs(registry);
183 IntranetRedirectDetector::RegisterPrefs(registry); 184 IntranetRedirectDetector::RegisterPrefs(registry);
184 IOThread::RegisterPrefs(registry); 185 IOThread::RegisterPrefs(registry);
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 chromeos::UserManager::RegisterPrefs(registry); 244 chromeos::UserManager::RegisterPrefs(registry);
244 chromeos::WallpaperManager::RegisterPrefs(registry); 245 chromeos::WallpaperManager::RegisterPrefs(registry);
245 chromeos::WizardController::RegisterPrefs(registry); 246 chromeos::WizardController::RegisterPrefs(registry);
246 policy::AutoEnrollmentClient::RegisterPrefs(registry); 247 policy::AutoEnrollmentClient::RegisterPrefs(registry);
247 policy::DeviceStatusCollector::RegisterPrefs(registry); 248 policy::DeviceStatusCollector::RegisterPrefs(registry);
248 #endif 249 #endif
249 250
250 #if defined(OS_MACOSX) 251 #if defined(OS_MACOSX)
251 confirm_quit::RegisterLocalState(registry); 252 confirm_quit::RegisterLocalState(registry);
252 #endif 253 #endif
253
254 #if defined(ENABLE_SETTINGS_APP)
255 chrome::RegisterAppListPrefs(registry);
256 #endif
257 } 254 }
258 255
259 void RegisterUserPrefs(PrefService* user_prefs, 256 void RegisterUserPrefs(PrefService* user_prefs,
260 PrefRegistrySyncable* registry) { 257 PrefRegistrySyncable* registry) {
261 // TODO(joi): Get rid of the need for the PrefService parameter, and 258 // TODO(joi): Get rid of the need for the PrefService parameter, and
262 // do registration prior to PrefService creation. 259 // do registration prior to PrefService creation.
263 260
264 // User prefs. Please keep this list alphabetized. 261 // User prefs. Please keep this list alphabetized.
265 AlternateErrorPageTabObserver::RegisterUserPrefs(registry); 262 AlternateErrorPageTabObserver::RegisterUserPrefs(registry);
266 AutofillManager::RegisterUserPrefs(registry); 263 AutofillManager::RegisterUserPrefs(registry);
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 } 430 }
434 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 431 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
435 432
436 current_version |= GOOGLE_URL_TRACKER_PREFS; 433 current_version |= GOOGLE_URL_TRACKER_PREFS;
437 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 434 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
438 current_version); 435 current_version);
439 } 436 }
440 } 437 }
441 438
442 } // namespace chrome 439 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698