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

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

Issue 12662032: Merge SavePackageFilePicker{,ChromeOS} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: @r198452 Created 7 years, 7 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 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"
11 #include "chrome/browser/accessibility/invert_bubble_prefs.h" 11 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
12 #include "chrome/browser/background/background_mode_manager.h" 12 #include "chrome/browser/background/background_mode_manager.h"
13 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h" 13 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h"
14 #include "chrome/browser/bookmarks/bookmark_utils.h" 14 #include "chrome/browser/bookmarks/bookmark_utils.h"
15 #include "chrome/browser/browser_process_impl.h" 15 #include "chrome/browser/browser_process_impl.h"
16 #include "chrome/browser/browser_shutdown.h" 16 #include "chrome/browser/browser_shutdown.h"
17 #include "chrome/browser/chrome_content_browser_client.h" 17 #include "chrome/browser/chrome_content_browser_client.h"
18 #include "chrome/browser/component_updater/recovery_component_installer.h" 18 #include "chrome/browser/component_updater/recovery_component_installer.h"
19 #include "chrome/browser/content_settings/host_content_settings_map.h" 19 #include "chrome/browser/content_settings/host_content_settings_map.h"
20 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 20 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
21 #include "chrome/browser/devtools/devtools_window.h" 21 #include "chrome/browser/devtools/devtools_window.h"
22 #include "chrome/browser/download/chrome_download_manager_delegate.h"
23 #include "chrome/browser/download/download_prefs.h" 22 #include "chrome/browser/download/download_prefs.h"
24 #include "chrome/browser/extensions/api/commands/command_service.h" 23 #include "chrome/browser/extensions/api/commands/command_service.h"
25 #include "chrome/browser/extensions/api/tabs/tabs_api.h" 24 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
26 #include "chrome/browser/extensions/component_loader.h" 25 #include "chrome/browser/extensions/component_loader.h"
27 #include "chrome/browser/extensions/extension_prefs.h" 26 #include "chrome/browser/extensions/extension_prefs.h"
28 #include "chrome/browser/extensions/extension_web_ui.h" 27 #include "chrome/browser/extensions/extension_web_ui.h"
29 #include "chrome/browser/external_protocol/external_protocol_handler.h" 28 #include "chrome/browser/external_protocol/external_protocol_handler.h"
30 #include "chrome/browser/first_run/first_run.h" 29 #include "chrome/browser/first_run/first_run.h"
31 #include "chrome/browser/geolocation/geolocation_prefs.h" 30 #include "chrome/browser/geolocation/geolocation_prefs.h"
32 #include "chrome/browser/google/google_url_tracker.h" 31 #include "chrome/browser/google/google_url_tracker.h"
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry) { 272 void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
274 // User prefs. Please keep this list alphabetized. 273 // User prefs. Please keep this list alphabetized.
275 AlternateErrorPageTabObserver::RegisterUserPrefs(registry); 274 AlternateErrorPageTabObserver::RegisterUserPrefs(registry);
276 autofill::AutofillDialogControllerImpl::RegisterUserPrefs(registry); 275 autofill::AutofillDialogControllerImpl::RegisterUserPrefs(registry);
277 autofill::AutofillManager::RegisterUserPrefs(registry); 276 autofill::AutofillManager::RegisterUserPrefs(registry);
278 BookmarkPromptPrefs::RegisterUserPrefs(registry); 277 BookmarkPromptPrefs::RegisterUserPrefs(registry);
279 bookmark_utils::RegisterUserPrefs(registry); 278 bookmark_utils::RegisterUserPrefs(registry);
280 browser_sync::SyncPrefs::RegisterUserPrefs(registry); 279 browser_sync::SyncPrefs::RegisterUserPrefs(registry);
281 chrome::RegisterInstantUserPrefs(registry); 280 chrome::RegisterInstantUserPrefs(registry);
282 ChromeContentBrowserClient::RegisterUserPrefs(registry); 281 ChromeContentBrowserClient::RegisterUserPrefs(registry);
283 ChromeDownloadManagerDelegate::RegisterUserPrefs(registry);
284 ChromeVersionService::RegisterUserPrefs(registry); 282 ChromeVersionService::RegisterUserPrefs(registry);
285 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( 283 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs(
286 registry); 284 registry);
287 chrome_browser_net::Predictor::RegisterUserPrefs(registry); 285 chrome_browser_net::Predictor::RegisterUserPrefs(registry);
288 DownloadPrefs::RegisterUserPrefs(registry); 286 DownloadPrefs::RegisterUserPrefs(registry);
289 extensions::ComponentLoader::RegisterUserPrefs(registry); 287 extensions::ComponentLoader::RegisterUserPrefs(registry);
290 extensions::ExtensionPrefs::RegisterUserPrefs(registry); 288 extensions::ExtensionPrefs::RegisterUserPrefs(registry);
291 ExtensionWebUI::RegisterUserPrefs(registry); 289 ExtensionWebUI::RegisterUserPrefs(registry);
292 first_run::RegisterUserPrefs(registry); 290 first_run::RegisterUserPrefs(registry);
293 HostContentSettingsMap::RegisterUserPrefs(registry); 291 HostContentSettingsMap::RegisterUserPrefs(registry);
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 } 452 }
455 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 453 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
456 454
457 current_version |= GOOGLE_URL_TRACKER_PREFS; 455 current_version |= GOOGLE_URL_TRACKER_PREFS;
458 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 456 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
459 current_version); 457 current_version);
460 } 458 }
461 } 459 }
462 460
463 } // namespace chrome 461 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698