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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 54863002: Implement a salt for MediaSource IDs that can be cleared by a user. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved GetMediaDeviceIDSalt to ResourceContext. Created 7 years, 1 month 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
« no previous file with comments | « chrome/browser/media/media_device_id_salt.cc ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | chrome/browser/profiles/profile_io_data.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
(...skipping 19 matching lines...) Expand all
30 #include "chrome/browser/external_protocol/external_protocol_handler.h" 30 #include "chrome/browser/external_protocol/external_protocol_handler.h"
31 #include "chrome/browser/first_run/first_run.h" 31 #include "chrome/browser/first_run/first_run.h"
32 #include "chrome/browser/geolocation/geolocation_prefs.h" 32 #include "chrome/browser/geolocation/geolocation_prefs.h"
33 #include "chrome/browser/google/google_url_tracker.h" 33 #include "chrome/browser/google/google_url_tracker.h"
34 #include "chrome/browser/google/google_url_tracker_factory.h" 34 #include "chrome/browser/google/google_url_tracker_factory.h"
35 #include "chrome/browser/gpu/gl_string_manager.h" 35 #include "chrome/browser/gpu/gl_string_manager.h"
36 #include "chrome/browser/gpu/gpu_mode_manager.h" 36 #include "chrome/browser/gpu/gpu_mode_manager.h"
37 #include "chrome/browser/intranet_redirect_detector.h" 37 #include "chrome/browser/intranet_redirect_detector.h"
38 #include "chrome/browser/io_thread.h" 38 #include "chrome/browser/io_thread.h"
39 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 39 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
40 #include "chrome/browser/media/media_device_id_salt.h"
40 #include "chrome/browser/media/media_stream_devices_controller.h" 41 #include "chrome/browser/media/media_stream_devices_controller.h"
41 #include "chrome/browser/metrics/metrics_log.h" 42 #include "chrome/browser/metrics/metrics_log.h"
42 #include "chrome/browser/metrics/metrics_service.h" 43 #include "chrome/browser/metrics/metrics_service.h"
43 #include "chrome/browser/metrics/variations/variations_service.h" 44 #include "chrome/browser/metrics/variations/variations_service.h"
44 #include "chrome/browser/net/http_server_properties_manager.h" 45 #include "chrome/browser/net/http_server_properties_manager.h"
45 #include "chrome/browser/net/net_pref_observer.h" 46 #include "chrome/browser/net/net_pref_observer.h"
46 #include "chrome/browser/net/predictor.h" 47 #include "chrome/browser/net/predictor.h"
47 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" 48 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
48 #include "chrome/browser/net/ssl_config_service_manager.h" 49 #include "chrome/browser/net/ssl_config_service_manager.h"
49 #include "chrome/browser/network_time/network_time_service.h" 50 #include "chrome/browser/network_time/network_time_service.h"
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( 331 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs(
331 registry); 332 registry);
332 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); 333 chrome_browser_net::Predictor::RegisterProfilePrefs(registry);
333 DownloadPrefs::RegisterProfilePrefs(registry); 334 DownloadPrefs::RegisterProfilePrefs(registry);
334 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); 335 extensions::ExtensionPrefs::RegisterProfilePrefs(registry);
335 ExtensionWebUI::RegisterProfilePrefs(registry); 336 ExtensionWebUI::RegisterProfilePrefs(registry);
336 HostContentSettingsMap::RegisterProfilePrefs(registry); 337 HostContentSettingsMap::RegisterProfilePrefs(registry);
337 IncognitoModePrefs::RegisterProfilePrefs(registry); 338 IncognitoModePrefs::RegisterProfilePrefs(registry);
338 InstantUI::RegisterProfilePrefs(registry); 339 InstantUI::RegisterProfilePrefs(registry);
339 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); 340 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry);
341 MediaDeviceIDSalt::RegisterProfilePrefs(registry);
340 MediaStreamDevicesController::RegisterProfilePrefs(registry); 342 MediaStreamDevicesController::RegisterProfilePrefs(registry);
341 NetPrefObserver::RegisterProfilePrefs(registry); 343 NetPrefObserver::RegisterProfilePrefs(registry);
342 NetworkTimeService::RegisterProfilePrefs(registry); 344 NetworkTimeService::RegisterProfilePrefs(registry);
343 NewTabUI::RegisterProfilePrefs(registry); 345 NewTabUI::RegisterProfilePrefs(registry);
344 PasswordGenerationManager::RegisterProfilePrefs(registry); 346 PasswordGenerationManager::RegisterProfilePrefs(registry);
345 PasswordManager::RegisterProfilePrefs(registry); 347 PasswordManager::RegisterProfilePrefs(registry);
346 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); 348 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry);
347 PrefsTabHelper::RegisterProfilePrefs(registry); 349 PrefsTabHelper::RegisterProfilePrefs(registry);
348 Profile::RegisterProfilePrefs(registry); 350 Profile::RegisterProfilePrefs(registry);
349 ProfileImpl::RegisterProfilePrefs(registry); 351 ProfileImpl::RegisterProfilePrefs(registry);
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 } 557 }
556 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 558 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
557 559
558 current_version |= GOOGLE_URL_TRACKER_PREFS; 560 current_version |= GOOGLE_URL_TRACKER_PREFS;
559 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 561 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
560 current_version); 562 current_version);
561 } 563 }
562 } 564 }
563 565
564 } // namespace chrome 566 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/media/media_device_id_salt.cc ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | chrome/browser/profiles/profile_io_data.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698