| Index: chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
|
| diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
|
| index bad2c65ba910aa77786325413327349f1d3bb770..82c81a7d13aae60457b7e8f8b39e8e54cdcb4fcc 100644
|
| --- a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
|
| +++ b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
|
| @@ -135,10 +135,10 @@ bool BrowsingDataSettingsFunction::RunSync() {
|
| new base::DictionaryValue);
|
| origin_types->SetBoolean(
|
| extension_browsing_data_api_constants::kUnprotectedWebKey,
|
| - prefs->GetBoolean(prefs::kDeleteCookies));
|
| + prefs->GetBoolean(browsing_data::prefs::kDeleteCookies));
|
| origin_types->SetBoolean(
|
| extension_browsing_data_api_constants::kProtectedWebKey,
|
| - prefs->GetBoolean(prefs::kDeleteHostedAppsData));
|
| + prefs->GetBoolean(browsing_data::prefs::kDeleteHostedAppsData));
|
| origin_types->SetBoolean(
|
| extension_browsing_data_api_constants::kExtensionsKey, false);
|
|
|
| @@ -161,8 +161,9 @@ bool BrowsingDataSettingsFunction::RunSync() {
|
| std::unique_ptr<base::DictionaryValue> selected(new base::DictionaryValue);
|
| std::unique_ptr<base::DictionaryValue> permitted(new base::DictionaryValue);
|
|
|
| - bool delete_site_data = prefs->GetBoolean(prefs::kDeleteCookies) ||
|
| - prefs->GetBoolean(prefs::kDeleteHostedAppsData);
|
| + bool delete_site_data =
|
| + prefs->GetBoolean(browsing_data::prefs::kDeleteCookies) ||
|
| + prefs->GetBoolean(browsing_data::prefs::kDeleteHostedAppsData);
|
|
|
| SetDetails(selected.get(), permitted.get(),
|
| extension_browsing_data_api_constants::kAppCacheKey,
|
| @@ -198,19 +199,19 @@ bool BrowsingDataSettingsFunction::RunSync() {
|
|
|
| SetDetails(selected.get(), permitted.get(),
|
| extension_browsing_data_api_constants::kHistoryKey,
|
| - prefs->GetBoolean(prefs::kDeleteBrowsingHistory));
|
| + prefs->GetBoolean(browsing_data::prefs::kDeleteBrowsingHistory));
|
| SetDetails(selected.get(), permitted.get(),
|
| extension_browsing_data_api_constants::kDownloadsKey,
|
| - prefs->GetBoolean(prefs::kDeleteDownloadHistory));
|
| + prefs->GetBoolean(browsing_data::prefs::kDeleteDownloadHistory));
|
| SetDetails(selected.get(), permitted.get(),
|
| extension_browsing_data_api_constants::kCacheKey,
|
| - prefs->GetBoolean(prefs::kDeleteCache));
|
| + prefs->GetBoolean(browsing_data::prefs::kDeleteCache));
|
| SetDetails(selected.get(), permitted.get(),
|
| extension_browsing_data_api_constants::kFormDataKey,
|
| - prefs->GetBoolean(prefs::kDeleteFormData));
|
| + prefs->GetBoolean(browsing_data::prefs::kDeleteFormData));
|
| SetDetails(selected.get(), permitted.get(),
|
| extension_browsing_data_api_constants::kPasswordsKey,
|
| - prefs->GetBoolean(prefs::kDeletePasswords));
|
| + prefs->GetBoolean(browsing_data::prefs::kDeletePasswords));
|
|
|
| std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue);
|
| result->Set(extension_browsing_data_api_constants::kOptionsKey,
|
|
|