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

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

Issue 12090062: Enable profile switching for standalone App Launcher via the Settings App. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable tests on aura 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "chrome/browser/profiles/profile_impl.h" 52 #include "chrome/browser/profiles/profile_impl.h"
53 #include "chrome/browser/profiles/profile_info_cache.h" 53 #include "chrome/browser/profiles/profile_info_cache.h"
54 #include "chrome/browser/profiles/profile_manager.h" 54 #include "chrome/browser/profiles/profile_manager.h"
55 #include "chrome/browser/renderer_host/web_cache_manager.h" 55 #include "chrome/browser/renderer_host/web_cache_manager.h"
56 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 56 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
57 #include "chrome/browser/signin/signin_manager_factory.h" 57 #include "chrome/browser/signin/signin_manager_factory.h"
58 #include "chrome/browser/sync/sync_prefs.h" 58 #include "chrome/browser/sync/sync_prefs.h"
59 #include "chrome/browser/task_manager/task_manager.h" 59 #include "chrome/browser/task_manager/task_manager.h"
60 #include "chrome/browser/translate/translate_prefs.h" 60 #include "chrome/browser/translate/translate_prefs.h"
61 #include "chrome/browser/ui/alternate_error_tab_observer.h" 61 #include "chrome/browser/ui/alternate_error_tab_observer.h"
62 #include "chrome/browser/ui/app_list/app_list_util.h"
62 #include "chrome/browser/ui/browser_instant_controller.h" 63 #include "chrome/browser/ui/browser_instant_controller.h"
63 #include "chrome/browser/ui/browser_ui_prefs.h" 64 #include "chrome/browser/ui/browser_ui_prefs.h"
64 #include "chrome/browser/ui/network_profile_bubble.h" 65 #include "chrome/browser/ui/network_profile_bubble.h"
65 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 66 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
66 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 67 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
67 #include "chrome/browser/ui/startup/autolaunch_prompt.h" 68 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
68 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 69 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
69 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" 70 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
70 #include "chrome/browser/ui/webui/flags_ui.h" 71 #include "chrome/browser/ui/webui/flags_ui.h"
71 #include "chrome/browser/ui/webui/instant_ui.h" 72 #include "chrome/browser/ui/webui/instant_ui.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 chromeos::UserManager::RegisterPrefs(local_state); 216 chromeos::UserManager::RegisterPrefs(local_state);
216 chromeos::WallpaperManager::RegisterPrefs(local_state); 217 chromeos::WallpaperManager::RegisterPrefs(local_state);
217 chromeos::WizardController::RegisterPrefs(local_state); 218 chromeos::WizardController::RegisterPrefs(local_state);
218 policy::AutoEnrollmentClient::RegisterPrefs(local_state); 219 policy::AutoEnrollmentClient::RegisterPrefs(local_state);
219 policy::DeviceStatusCollector::RegisterPrefs(local_state); 220 policy::DeviceStatusCollector::RegisterPrefs(local_state);
220 #endif 221 #endif
221 222
222 #if defined(OS_MACOSX) 223 #if defined(OS_MACOSX)
223 confirm_quit::RegisterLocalState(local_state); 224 confirm_quit::RegisterLocalState(local_state);
224 #endif 225 #endif
226
227 #if defined(ENABLE_SETTINGS_APP)
228 chrome::RegisterAppListPrefs(local_state);
229 #endif
225 } 230 }
226 231
227 void RegisterUserPrefs(PrefServiceSyncable* user_prefs) { 232 void RegisterUserPrefs(PrefServiceSyncable* user_prefs) {
228 // User prefs. Please keep this list alphabetized. 233 // User prefs. Please keep this list alphabetized.
229 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); 234 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs);
230 AutofillManager::RegisterUserPrefs(user_prefs); 235 AutofillManager::RegisterUserPrefs(user_prefs);
231 BookmarkPromptPrefs::RegisterUserPrefs(user_prefs); 236 BookmarkPromptPrefs::RegisterUserPrefs(user_prefs);
232 bookmark_utils::RegisterUserPrefs(user_prefs); 237 bookmark_utils::RegisterUserPrefs(user_prefs);
233 BrowserInstantController::RegisterUserPrefs(user_prefs); 238 BrowserInstantController::RegisterUserPrefs(user_prefs);
234 browser_sync::SyncPrefs::RegisterUserPrefs(user_prefs); 239 browser_sync::SyncPrefs::RegisterUserPrefs(user_prefs);
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 } 391 }
387 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 392 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
388 393
389 current_version |= GOOGLE_URL_TRACKER_PREFS; 394 current_version |= GOOGLE_URL_TRACKER_PREFS;
390 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 395 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
391 current_version); 396 current_version);
392 } 397 }
393 } 398 }
394 399
395 } // namespace chrome 400 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_install_ui_default.cc ('k') | chrome/browser/profiles/profile_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698