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

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

Issue 1024563005: media: Remove kRAConsentGranted pref. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 years, 8 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 <string> 7 #include <string>
8 8
9 #include "base/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 chromeos::file_system_provider::RegisterProfilePrefs(registry); 491 chromeos::file_system_provider::RegisterProfilePrefs(registry);
492 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); 492 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry);
493 chromeos::Preferences::RegisterProfilePrefs(registry); 493 chromeos::Preferences::RegisterProfilePrefs(registry);
494 chromeos::proxy_config::RegisterProfilePrefs(registry); 494 chromeos::proxy_config::RegisterProfilePrefs(registry);
495 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); 495 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry);
496 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); 496 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry);
497 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); 497 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry);
498 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: 498 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction::
499 RegisterProfilePrefs(registry); 499 RegisterProfilePrefs(registry);
500 FlagsUI::RegisterProfilePrefs(registry); 500 FlagsUI::RegisterProfilePrefs(registry);
501 ProtectedMediaIdentifierPermissionContext::RegisterProfilePrefs(registry);
502 #endif 501 #endif
503 502
504 #if defined(OS_WIN) 503 #if defined(OS_WIN)
505 component_updater::RegisterProfilePrefsForSwReporter(registry); 504 component_updater::RegisterProfilePrefsForSwReporter(registry);
506 NetworkProfileBubble::RegisterProfilePrefs(registry); 505 NetworkProfileBubble::RegisterProfilePrefs(registry);
507 #endif 506 #endif
508 507
509 #if defined(TOOLKIT_VIEWS) 508 #if defined(TOOLKIT_VIEWS)
510 RegisterBrowserViewProfilePrefs(registry); 509 RegisterBrowserViewProfilePrefs(registry);
511 RegisterInvertBubbleUserPrefs(registry); 510 RegisterInvertBubbleUserPrefs(registry);
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); 623 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */);
625 624
626 // We're done migrating the profile per-host zoom level values, so we clear 625 // We're done migrating the profile per-host zoom level values, so we clear
627 // them all. 626 // them all.
628 DictionaryPrefUpdate host_zoom_dictionary_update( 627 DictionaryPrefUpdate host_zoom_dictionary_update(
629 prefs, prefs::kPerHostZoomLevelsDeprecated); 628 prefs, prefs::kPerHostZoomLevelsDeprecated);
630 host_zoom_dictionary_update->Clear(); 629 host_zoom_dictionary_update->Clear();
631 } 630 }
632 631
633 } // namespace chrome 632 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/media/protected_media_identifier_permission_context.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698