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

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

Issue 14813039: Retire the Enterprise Web Store policies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 6 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" 22 #include "chrome/browser/download/chrome_download_manager_delegate.h"
23 #include "chrome/browser/download/download_prefs.h" 23 #include "chrome/browser/download/download_prefs.h"
24 #include "chrome/browser/extensions/api/commands/command_service.h" 24 #include "chrome/browser/extensions/api/commands/command_service.h"
25 #include "chrome/browser/extensions/api/tabs/tabs_api.h" 25 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
26 #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"
33 #include "chrome/browser/google/google_url_tracker_factory.h" 32 #include "chrome/browser/google/google_url_tracker_factory.h"
34 #include "chrome/browser/gpu/gl_string_manager.h" 33 #include "chrome/browser/gpu/gl_string_manager.h"
35 #include "chrome/browser/gpu/gpu_mode_manager.h" 34 #include "chrome/browser/gpu/gpu_mode_manager.h"
36 #include "chrome/browser/intranet_redirect_detector.h" 35 #include "chrome/browser/intranet_redirect_detector.h"
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 bookmark_utils::RegisterUserPrefs(registry); 287 bookmark_utils::RegisterUserPrefs(registry);
289 browser_sync::SyncPrefs::RegisterUserPrefs(registry); 288 browser_sync::SyncPrefs::RegisterUserPrefs(registry);
290 chrome::RegisterInstantUserPrefs(registry); 289 chrome::RegisterInstantUserPrefs(registry);
291 ChromeContentBrowserClient::RegisterUserPrefs(registry); 290 ChromeContentBrowserClient::RegisterUserPrefs(registry);
292 ChromeDownloadManagerDelegate::RegisterUserPrefs(registry); 291 ChromeDownloadManagerDelegate::RegisterUserPrefs(registry);
293 ChromeVersionService::RegisterUserPrefs(registry); 292 ChromeVersionService::RegisterUserPrefs(registry);
294 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( 293 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs(
295 registry); 294 registry);
296 chrome_browser_net::Predictor::RegisterUserPrefs(registry); 295 chrome_browser_net::Predictor::RegisterUserPrefs(registry);
297 DownloadPrefs::RegisterUserPrefs(registry); 296 DownloadPrefs::RegisterUserPrefs(registry);
298 extensions::ComponentLoader::RegisterUserPrefs(registry);
299 extensions::ExtensionPrefs::RegisterUserPrefs(registry); 297 extensions::ExtensionPrefs::RegisterUserPrefs(registry);
300 ExtensionWebUI::RegisterUserPrefs(registry); 298 ExtensionWebUI::RegisterUserPrefs(registry);
301 first_run::RegisterUserPrefs(registry); 299 first_run::RegisterUserPrefs(registry);
302 HostContentSettingsMap::RegisterUserPrefs(registry); 300 HostContentSettingsMap::RegisterUserPrefs(registry);
303 IncognitoModePrefs::RegisterUserPrefs(registry); 301 IncognitoModePrefs::RegisterUserPrefs(registry);
304 InstantUI::RegisterUserPrefs(registry); 302 InstantUI::RegisterUserPrefs(registry);
305 invalidation::InvalidatorStorage::RegisterUserPrefs(registry); 303 invalidation::InvalidatorStorage::RegisterUserPrefs(registry);
306 MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry); 304 MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry);
307 MediaStreamDevicesController::RegisterUserPrefs(registry); 305 MediaStreamDevicesController::RegisterUserPrefs(registry);
308 NetPrefObserver::RegisterUserPrefs(registry); 306 NetPrefObserver::RegisterUserPrefs(registry);
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 } 463 }
466 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 464 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
467 465
468 current_version |= GOOGLE_URL_TRACKER_PREFS; 466 current_version |= GOOGLE_URL_TRACKER_PREFS;
469 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 467 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
470 current_version); 468 current_version);
471 } 469 }
472 } 470 }
473 471
474 } // namespace chrome 472 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698