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

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: fix some obvious dumbs 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 "chrome/browser/about_flags.h" 7 #include "chrome/browser/about_flags.h"
8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
9 #include "chrome/browser/autofill/autofill_manager.h" 9 #include "chrome/browser/autofill/autofill_manager.h"
10 #include "chrome/browser/background/background_mode_manager.h" 10 #include "chrome/browser/background/background_mode_manager.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #include "chrome/browser/profiles/profile_impl.h" 56 #include "chrome/browser/profiles/profile_impl.h"
57 #include "chrome/browser/profiles/profile_info_cache.h" 57 #include "chrome/browser/profiles/profile_info_cache.h"
58 #include "chrome/browser/profiles/profile_manager.h" 58 #include "chrome/browser/profiles/profile_manager.h"
59 #include "chrome/browser/renderer_host/web_cache_manager.h" 59 #include "chrome/browser/renderer_host/web_cache_manager.h"
60 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 60 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
61 #include "chrome/browser/signin/signin_manager_factory.h" 61 #include "chrome/browser/signin/signin_manager_factory.h"
62 #include "chrome/browser/sync/sync_prefs.h" 62 #include "chrome/browser/sync/sync_prefs.h"
63 #include "chrome/browser/task_manager/task_manager.h" 63 #include "chrome/browser/task_manager/task_manager.h"
64 #include "chrome/browser/translate/translate_prefs.h" 64 #include "chrome/browser/translate/translate_prefs.h"
65 #include "chrome/browser/ui/alternate_error_tab_observer.h" 65 #include "chrome/browser/ui/alternate_error_tab_observer.h"
66 #include "chrome/browser/ui/app_list/app_list_util.h" 66 #include "chrome/browser/ui/app_list_service.h"
67 #include "chrome/browser/ui/browser_instant_controller.h" 67 #include "chrome/browser/ui/browser_instant_controller.h"
68 #include "chrome/browser/ui/browser_ui_prefs.h" 68 #include "chrome/browser/ui/browser_ui_prefs.h"
69 #include "chrome/browser/ui/network_profile_bubble.h" 69 #include "chrome/browser/ui/network_profile_bubble.h"
70 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 70 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
71 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 71 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
72 #include "chrome/browser/ui/startup/autolaunch_prompt.h" 72 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
73 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 73 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
74 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" 74 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
75 #include "chrome/browser/ui/webui/flags_ui.h" 75 #include "chrome/browser/ui/webui/flags_ui.h"
76 #include "chrome/browser/ui/webui/instant_ui.h" 76 #include "chrome/browser/ui/webui/instant_ui.h"
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 chromeos::WallpaperManager::RegisterPrefs(registry); 226 chromeos::WallpaperManager::RegisterPrefs(registry);
227 chromeos::WizardController::RegisterPrefs(registry); 227 chromeos::WizardController::RegisterPrefs(registry);
228 policy::AutoEnrollmentClient::RegisterPrefs(registry); 228 policy::AutoEnrollmentClient::RegisterPrefs(registry);
229 policy::DeviceStatusCollector::RegisterPrefs(registry); 229 policy::DeviceStatusCollector::RegisterPrefs(registry);
230 #endif 230 #endif
231 231
232 #if defined(OS_MACOSX) 232 #if defined(OS_MACOSX)
233 confirm_quit::RegisterLocalState(registry); 233 confirm_quit::RegisterLocalState(registry);
234 #endif 234 #endif
235 235
236 #if defined(ENABLE_SETTINGS_APP) 236 AppListService::RegisterAppListPrefs(registry);
237 chrome::RegisterAppListPrefs(registry);
238 #endif
239 } 237 }
240 238
241 void RegisterUserPrefs(PrefService* user_prefs, 239 void RegisterUserPrefs(PrefService* user_prefs,
242 PrefRegistrySyncable* registry) { 240 PrefRegistrySyncable* registry) {
243 // TODO(joi): Get rid of the need for the PrefService parameter, and 241 // TODO(joi): Get rid of the need for the PrefService parameter, and
244 // do registration prior to PrefService creation. 242 // do registration prior to PrefService creation.
245 243
246 // User prefs. Please keep this list alphabetized. 244 // User prefs. Please keep this list alphabetized.
247 AlternateErrorPageTabObserver::RegisterUserPrefs(registry); 245 AlternateErrorPageTabObserver::RegisterUserPrefs(registry);
248 AutofillManager::RegisterUserPrefs(registry); 246 AutofillManager::RegisterUserPrefs(registry);
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 } 413 }
416 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 414 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
417 415
418 current_version |= GOOGLE_URL_TRACKER_PREFS; 416 current_version |= GOOGLE_URL_TRACKER_PREFS;
419 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 417 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
420 current_version); 418 current_version);
421 } 419 }
422 } 420 }
423 421
424 } // namespace chrome 422 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698