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

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

Issue 10875027: Restart running apps when chrome restarts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: respond to comments, rebase Created 8 years, 3 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 | Annotate | Revision Log
OLDNEW
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/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"
11 #include "chrome/browser/bookmarks/bookmark_utils.h" 11 #include "chrome/browser/bookmarks/bookmark_utils.h"
12 #include "chrome/browser/browser_shutdown.h" 12 #include "chrome/browser/browser_shutdown.h"
13 #include "chrome/browser/chrome_content_browser_client.h" 13 #include "chrome/browser/chrome_content_browser_client.h"
14 #include "chrome/browser/content_settings/host_content_settings_map.h" 14 #include "chrome/browser/content_settings/host_content_settings_map.h"
15 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 15 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
16 #include "chrome/browser/debugger/devtools_window.h" 16 #include "chrome/browser/debugger/devtools_window.h"
17 #include "chrome/browser/download/download_prefs.h" 17 #include "chrome/browser/download/download_prefs.h"
18 #include "chrome/browser/extensions/api/commands/command_service.h" 18 #include "chrome/browser/extensions/api/commands/command_service.h"
19 #include "chrome/browser/extensions/api/tabs/tabs.h" 19 #include "chrome/browser/extensions/api/tabs/tabs.h"
20 #include "chrome/browser/extensions/app_restore_service.h"
20 #include "chrome/browser/extensions/component_loader.h" 21 #include "chrome/browser/extensions/component_loader.h"
21 #include "chrome/browser/extensions/extension_prefs.h" 22 #include "chrome/browser/extensions/extension_prefs.h"
22 #include "chrome/browser/extensions/extension_web_ui.h" 23 #include "chrome/browser/extensions/extension_web_ui.h"
23 #include "chrome/browser/external_protocol/external_protocol_handler.h" 24 #include "chrome/browser/external_protocol/external_protocol_handler.h"
24 #include "chrome/browser/geolocation/geolocation_prefs.h" 25 #include "chrome/browser/geolocation/geolocation_prefs.h"
25 #include "chrome/browser/google/google_url_tracker.h" 26 #include "chrome/browser/google/google_url_tracker.h"
26 #include "chrome/browser/google/google_url_tracker_factory.h" 27 #include "chrome/browser/google/google_url_tracker_factory.h"
27 #include "chrome/browser/instant/instant_controller.h" 28 #include "chrome/browser/instant/instant_controller.h"
28 #include "chrome/browser/intents/web_intents_util.h" 29 #include "chrome/browser/intents/web_intents_util.h"
29 #include "chrome/browser/intranet_redirect_detector.h" 30 #include "chrome/browser/intranet_redirect_detector.h"
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 #endif 192 #endif
192 193
193 #if defined(OS_MACOSX) 194 #if defined(OS_MACOSX)
194 confirm_quit::RegisterLocalState(local_state); 195 confirm_quit::RegisterLocalState(local_state);
195 #endif 196 #endif
196 } 197 }
197 198
198 void RegisterUserPrefs(PrefService* user_prefs) { 199 void RegisterUserPrefs(PrefService* user_prefs) {
199 // User prefs 200 // User prefs
200 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); 201 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs);
202 AppRestoreService::RegisterUserPrefs(user_prefs);
201 AutofillManager::RegisterUserPrefs(user_prefs); 203 AutofillManager::RegisterUserPrefs(user_prefs);
202 bookmark_utils::RegisterUserPrefs(user_prefs); 204 bookmark_utils::RegisterUserPrefs(user_prefs);
203 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs); 205 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs);
204 ChromeVersionService::RegisterUserPrefs(user_prefs); 206 ChromeVersionService::RegisterUserPrefs(user_prefs);
205 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); 207 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs);
206 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); 208 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs);
207 DownloadPrefs::RegisterUserPrefs(user_prefs); 209 DownloadPrefs::RegisterUserPrefs(user_prefs);
208 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs); 210 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs);
209 ExtensionWebUI::RegisterUserPrefs(user_prefs); 211 ExtensionWebUI::RegisterUserPrefs(user_prefs);
210 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); 212 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs);
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 } 339 }
338 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 340 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
339 341
340 current_version |= GOOGLE_URL_TRACKER_PREFS; 342 current_version |= GOOGLE_URL_TRACKER_PREFS;
341 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 343 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
342 current_version); 344 current_version);
343 } 345 }
344 } 346 }
345 347
346 } // namespace chrome 348 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698