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

Side by Side Diff: components/browsing_data/core/pref_names.cc

Issue 2671743002: Separate state of basic and advanced tab in CBD dialog (Closed)
Patch Set: rebase and fix compilation Created 3 years, 9 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
« no previous file with comments | « components/browsing_data/core/pref_names.h ('k') | ios/chrome/app/main_controller.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "components/browsing_data/core/pref_names.h" 5 #include "components/browsing_data/core/pref_names.h"
6 6
7 #include "components/pref_registry/pref_registry_syncable.h" 7 #include "components/pref_registry/pref_registry_syncable.h"
8 8
9 namespace browsing_data { 9 namespace browsing_data {
10 10
11 namespace prefs { 11 namespace prefs {
12 12
13 // Clear browsing data deletion time period. 13 // Clear browsing data deletion time period.
14 const char kDeleteTimePeriod[] = "browser.clear_data.time_period"; 14 const char kDeleteTimePeriod[] = "browser.clear_data.time_period";
15 const char kDeleteTimePeriodBasic[] = "browser.clear_data.time_period_basic";
15 16
16 // Clear Browsing Data dialog datatype preferences. 17 // Clear Browsing Data dialog datatype preferences.
17 const char kDeleteBrowsingHistory[] = "browser.clear_data.browsing_history"; 18 const char kDeleteBrowsingHistory[] = "browser.clear_data.browsing_history";
19 const char kDeleteBrowsingHistoryBasic[] =
20 "browser.clear_data.browsing_history_basic";
18 const char kDeleteDownloadHistory[] = "browser.clear_data.download_history"; 21 const char kDeleteDownloadHistory[] = "browser.clear_data.download_history";
19 const char kDeleteCache[] = "browser.clear_data.cache"; 22 const char kDeleteCache[] = "browser.clear_data.cache";
23 const char kDeleteCacheBasic[] = "browser.clear_data.cache_basic";
20 const char kDeleteCookies[] = "browser.clear_data.cookies"; 24 const char kDeleteCookies[] = "browser.clear_data.cookies";
25 const char kDeleteCookiesBasic[] = "browser.clear_data.cookies_basic";
21 const char kDeletePasswords[] = "browser.clear_data.passwords"; 26 const char kDeletePasswords[] = "browser.clear_data.passwords";
22 const char kDeleteFormData[] = "browser.clear_data.form_data"; 27 const char kDeleteFormData[] = "browser.clear_data.form_data";
23 const char kDeleteHostedAppsData[] = "browser.clear_data.hosted_apps_data"; 28 const char kDeleteHostedAppsData[] = "browser.clear_data.hosted_apps_data";
24 const char kDeleteMediaLicenses[] = "browser.clear_data.media_licenses"; 29 const char kDeleteMediaLicenses[] = "browser.clear_data.media_licenses";
25 30
26 // Other Clear Browsing Data preferences. 31 // Other Clear Browsing Data preferences.
27 const char kLastClearBrowsingDataTime[] = 32 const char kLastClearBrowsingDataTime[] =
28 "browser.last_clear_browsing_data_time"; 33 "browser.last_clear_browsing_data_time";
29 const char kClearBrowsingDataHistoryNoticeShownTimes[] = 34 const char kClearBrowsingDataHistoryNoticeShownTimes[] =
30 "browser.clear_data.history_notice_shown_times"; 35 "browser.clear_data.history_notice_shown_times";
31 const char kLastClearBrowsingDataTab[] = "browser.last_clear_browsing_data_tab"; 36 const char kLastClearBrowsingDataTab[] = "browser.last_clear_browsing_data_tab";
37 const char kPreferencesMigratedToBasic[] =
38 "browser.clear_data.preferences_migrated_to_basic";
32 39
33 void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { 40 void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
34 registry->RegisterIntegerPref( 41 registry->RegisterIntegerPref(
35 kDeleteTimePeriod, 0, 42 kDeleteTimePeriod, 0,
36 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 43 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
44 registry->RegisterIntegerPref(
45 kDeleteTimePeriodBasic, 0,
46 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
37 registry->RegisterBooleanPref( 47 registry->RegisterBooleanPref(
38 kDeleteBrowsingHistory, true, 48 kDeleteBrowsingHistory, true,
39 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 49 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
40 registry->RegisterBooleanPref( 50 registry->RegisterBooleanPref(
41 kDeleteCache, true, 51 kDeleteBrowsingHistoryBasic, true,
42 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 52 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
43 registry->RegisterBooleanPref( 53 registry->RegisterBooleanPref(
44 kDeleteCookies, true, 54 kDeleteCache, true, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
55 registry->RegisterBooleanPref(
56 kDeleteCacheBasic, true, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
57 registry->RegisterBooleanPref(
58 kDeleteCookies, true, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
59 registry->RegisterBooleanPref(
60 kDeleteCookiesBasic, true,
45 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 61 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
46 registry->RegisterBooleanPref( 62 registry->RegisterBooleanPref(
47 kDeletePasswords, false, 63 kDeletePasswords, false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
48 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
49 registry->RegisterBooleanPref( 64 registry->RegisterBooleanPref(
50 kDeleteFormData, false, 65 kDeleteFormData, false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
51 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
52 registry->RegisterIntegerPref( 66 registry->RegisterIntegerPref(
53 kClearBrowsingDataHistoryNoticeShownTimes, 0); 67 kClearBrowsingDataHistoryNoticeShownTimes, 0);
54 68
55 #if !defined(OS_IOS) 69 #if !defined(OS_IOS)
56 registry->RegisterBooleanPref( 70 registry->RegisterBooleanPref(
57 kDeleteDownloadHistory, true, 71 kDeleteDownloadHistory, true,
58 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 72 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
59 registry->RegisterBooleanPref( 73 registry->RegisterBooleanPref(
60 kDeleteHostedAppsData, false, 74 kDeleteHostedAppsData, false,
61 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 75 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
62 registry->RegisterBooleanPref( 76 registry->RegisterBooleanPref(
63 kDeleteMediaLicenses, false, 77 kDeleteMediaLicenses, false,
64 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 78 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
65 registry->RegisterInt64Pref(prefs::kLastClearBrowsingDataTime, 0); 79 registry->RegisterInt64Pref(prefs::kLastClearBrowsingDataTime, 0);
66 #endif // !defined(OS_IOS) 80 #endif // !defined(OS_IOS)
67 81
68 #if defined(OS_ANDROID) 82 #if defined(OS_ANDROID)
69 registry->RegisterIntegerPref( 83 registry->RegisterIntegerPref(
70 kLastClearBrowsingDataTab, 0, 84 kLastClearBrowsingDataTab, 0,
71 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 85 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
72 #endif 86 #endif
87
88 registry->RegisterBooleanPref(
89 kPreferencesMigratedToBasic, false,
90 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
73 } 91 }
74 92
75 } // namespace prefs 93 } // namespace prefs
76 94
77 } // namespace browsing_data 95 } // namespace browsing_data
OLDNEW
« no previous file with comments | « components/browsing_data/core/pref_names.h ('k') | ios/chrome/app/main_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698