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

Side by Side Diff: chrome/browser/ui/browser_ui_prefs.cc

Issue 2075023002: UI Changes to support clearing EME/CDM data (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Media licenses everywhere Created 4 years, 5 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/ui/browser_ui_prefs.h" 5 #include "chrome/browser/ui/browser_ui_prefs.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/browser/first_run/first_run.h" 8 #include "chrome/browser/first_run/first_run.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 false, 58 false,
59 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 59 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
60 registry->RegisterBooleanPref( 60 registry->RegisterBooleanPref(
61 prefs::kDeleteFormData, 61 prefs::kDeleteFormData,
62 false, 62 false,
63 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 63 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
64 registry->RegisterBooleanPref( 64 registry->RegisterBooleanPref(
65 prefs::kDeleteHostedAppsData, 65 prefs::kDeleteHostedAppsData,
66 false, 66 false,
67 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 67 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
68 registry->RegisterBooleanPref(
69 prefs::kDeleteMediaLicenses, false,
70 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
68 registry->RegisterIntegerPref( 71 registry->RegisterIntegerPref(
69 prefs::kDeleteTimePeriod, 72 prefs::kDeleteTimePeriod,
70 0, 73 0,
71 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 74 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
72 registry->RegisterIntegerPref( 75 registry->RegisterIntegerPref(
73 prefs::kClearBrowsingDataHistoryNoticeShownTimes, 0); 76 prefs::kClearBrowsingDataHistoryNoticeShownTimes, 0);
74 registry->RegisterInt64Pref(prefs::kLastClearBrowsingDataTime, 0); 77 registry->RegisterInt64Pref(prefs::kLastClearBrowsingDataTime, 0);
75 registry->RegisterIntegerPref(prefs::kModuleConflictBubbleShown, 0); 78 registry->RegisterIntegerPref(prefs::kModuleConflictBubbleShown, 0);
76 registry->RegisterInt64Pref(prefs::kDefaultBrowserLastDeclined, 0); 79 registry->RegisterInt64Pref(prefs::kDefaultBrowserLastDeclined, 0);
77 bool reset_check_default = false; 80 bool reset_check_default = false;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 registry->RegisterBooleanPref( 146 registry->RegisterBooleanPref(
144 prefs::kHideFullscreenToolbar, 147 prefs::kHideFullscreenToolbar,
145 false, 148 false,
146 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 149 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
147 #else 150 #else
148 registry->RegisterBooleanPref(prefs::kFullscreenAllowed, true); 151 registry->RegisterBooleanPref(prefs::kFullscreenAllowed, true);
149 #endif 152 #endif
150 } 153 }
151 154
152 } // namespace chrome 155 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698