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

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

Issue 11968034: Enable profile switching for standalone App Launcher via the Settings App. (Closed) Base URL: git://nomatter.syd/chromium/src.git@master
Patch Set: track pending profile loads, respond to comments Created 7 years, 11 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"
benwells 2013/01/22 01:21:59 Nit: is this needed?
koz (OOO until 15th September) 2013/01/22 02:23:49 Nope, removed.
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 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 } 385 }
385 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 386 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
386 387
387 current_version |= GOOGLE_URL_TRACKER_PREFS; 388 current_version |= GOOGLE_URL_TRACKER_PREFS;
388 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 389 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
389 current_version); 390 current_version);
390 } 391 }
391 } 392 }
392 393
393 } // namespace chrome 394 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698