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

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

Issue 149233004: Revert "Automatically trigger installation of high-quality speech synthesis extension." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Don't remove WillSpeakUtteranceWithVoice, it is dependent upon by a test now. Created 6 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 "apps/prefs.h" 7 #include "apps/prefs.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
11 #include "chrome/browser/about_flags.h" 11 #include "chrome/browser/about_flags.h"
12 #include "chrome/browser/accessibility/invert_bubble_prefs.h" 12 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
13 #include "chrome/browser/apps/shortcut_manager.h" 13 #include "chrome/browser/apps/shortcut_manager.h"
14 #include "chrome/browser/background/background_mode_manager.h" 14 #include "chrome/browser/background/background_mode_manager.h"
15 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h" 15 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h"
16 #include "chrome/browser/bookmarks/bookmark_utils.h" 16 #include "chrome/browser/bookmarks/bookmark_utils.h"
17 #include "chrome/browser/browser_process_impl.h" 17 #include "chrome/browser/browser_process_impl.h"
18 #include "chrome/browser/browser_shutdown.h" 18 #include "chrome/browser/browser_shutdown.h"
19 #include "chrome/browser/chrome_content_browser_client.h" 19 #include "chrome/browser/chrome_content_browser_client.h"
20 #include "chrome/browser/component_updater/recovery_component_installer.h" 20 #include "chrome/browser/component_updater/recovery_component_installer.h"
21 #include "chrome/browser/content_settings/host_content_settings_map.h" 21 #include "chrome/browser/content_settings/host_content_settings_map.h"
22 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 22 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
23 #include "chrome/browser/devtools/devtools_window.h" 23 #include "chrome/browser/devtools/devtools_window.h"
24 #include "chrome/browser/download/download_prefs.h" 24 #include "chrome/browser/download/download_prefs.h"
25 #include "chrome/browser/extensions/activity_log/activity_log.h" 25 #include "chrome/browser/extensions/activity_log/activity_log.h"
26 #include "chrome/browser/extensions/api/commands/command_service.h" 26 #include "chrome/browser/extensions/api/commands/command_service.h"
27 #include "chrome/browser/extensions/api/tabs/tabs_api.h" 27 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
28 #include "chrome/browser/extensions/extension_web_ui.h" 28 #include "chrome/browser/extensions/extension_web_ui.h"
29 #include "chrome/browser/extensions/external_component_loader.h"
30 #include "chrome/browser/external_protocol/external_protocol_handler.h" 29 #include "chrome/browser/external_protocol/external_protocol_handler.h"
31 #include "chrome/browser/first_run/first_run.h" 30 #include "chrome/browser/first_run/first_run.h"
32 #include "chrome/browser/geolocation/geolocation_prefs.h" 31 #include "chrome/browser/geolocation/geolocation_prefs.h"
33 #include "chrome/browser/google/google_url_tracker.h" 32 #include "chrome/browser/google/google_url_tracker.h"
34 #include "chrome/browser/google/google_url_tracker_factory.h" 33 #include "chrome/browser/google/google_url_tracker_factory.h"
35 #include "chrome/browser/gpu/gl_string_manager.h" 34 #include "chrome/browser/gpu/gl_string_manager.h"
36 #include "chrome/browser/gpu/gpu_mode_manager.h" 35 #include "chrome/browser/gpu/gpu_mode_manager.h"
37 #include "chrome/browser/intranet_redirect_detector.h" 36 #include "chrome/browser/intranet_redirect_detector.h"
38 #include "chrome/browser/io_thread.h" 37 #include "chrome/browser/io_thread.h"
39 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 38 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 BookmarkPromptPrefs::RegisterProfilePrefs(registry); 336 BookmarkPromptPrefs::RegisterProfilePrefs(registry);
338 bookmark_utils::RegisterProfilePrefs(registry); 337 bookmark_utils::RegisterProfilePrefs(registry);
339 browser_sync::SyncPrefs::RegisterProfilePrefs(registry); 338 browser_sync::SyncPrefs::RegisterProfilePrefs(registry);
340 ChromeContentBrowserClient::RegisterProfilePrefs(registry); 339 ChromeContentBrowserClient::RegisterProfilePrefs(registry);
341 ChromeVersionService::RegisterProfilePrefs(registry); 340 ChromeVersionService::RegisterProfilePrefs(registry);
342 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( 341 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs(
343 registry); 342 registry);
344 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); 343 chrome_browser_net::Predictor::RegisterProfilePrefs(registry);
345 DownloadPrefs::RegisterProfilePrefs(registry); 344 DownloadPrefs::RegisterProfilePrefs(registry);
346 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); 345 extensions::ExtensionPrefs::RegisterProfilePrefs(registry);
347 extensions::ExternalComponentLoader::RegisterProfilePrefs(registry);
348 ExtensionWebUI::RegisterProfilePrefs(registry); 346 ExtensionWebUI::RegisterProfilePrefs(registry);
349 HostContentSettingsMap::RegisterProfilePrefs(registry); 347 HostContentSettingsMap::RegisterProfilePrefs(registry);
350 IncognitoModePrefs::RegisterProfilePrefs(registry); 348 IncognitoModePrefs::RegisterProfilePrefs(registry);
351 InstantUI::RegisterProfilePrefs(registry); 349 InstantUI::RegisterProfilePrefs(registry);
352 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); 350 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry);
353 MediaDeviceIDSalt::RegisterProfilePrefs(registry); 351 MediaDeviceIDSalt::RegisterProfilePrefs(registry);
354 MediaStreamDevicesController::RegisterProfilePrefs(registry); 352 MediaStreamDevicesController::RegisterProfilePrefs(registry);
355 NetPrefObserver::RegisterProfilePrefs(registry); 353 NetPrefObserver::RegisterProfilePrefs(registry);
356 NetworkTimeService::RegisterProfilePrefs(registry); 354 NetworkTimeService::RegisterProfilePrefs(registry);
357 NewTabUI::RegisterProfilePrefs(registry); 355 NewTabUI::RegisterProfilePrefs(registry);
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 569 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
572 current_version); 570 current_version);
573 } 571 }
574 572
575 #if defined(OS_CHROMEOS) 573 #if defined(OS_CHROMEOS)
576 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 574 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
577 #endif 575 #endif
578 } 576 }
579 577
580 } // namespace chrome 578 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698