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

Unified Diff: chrome/browser/extensions/api/browsing_data/browsing_data_api.cc

Issue 2298493003: [Extensions] Convert some ChromeSyncExtensionFunctions (Closed)
Patch Set: fix Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
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 f32aa587e9df014be15bbe0a679e0c04792398d4..a282a8dd84a75bb301baf9a873f6e8d0197d81d2 100644
--- a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
+++ b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
@@ -123,8 +123,8 @@ bool IsRemovalPermitted(int removal_mask, PrefService* prefs) {
} // namespace
-bool BrowsingDataSettingsFunction::RunSync() {
- PrefService* prefs = GetProfile()->GetPrefs();
+ExtensionFunction::ResponseAction BrowsingDataSettingsFunction::Run() {
+ prefs_ = Profile::FromBrowserContext(browser_context())->GetPrefs();
// Fill origin types.
// The "cookies" and "hosted apps" UI checkboxes both map to
@@ -135,15 +135,15 @@ bool BrowsingDataSettingsFunction::RunSync() {
new base::DictionaryValue);
origin_types->SetBoolean(
extension_browsing_data_api_constants::kUnprotectedWebKey,
- prefs->GetBoolean(browsing_data::prefs::kDeleteCookies));
+ prefs_->GetBoolean(browsing_data::prefs::kDeleteCookies));
origin_types->SetBoolean(
extension_browsing_data_api_constants::kProtectedWebKey,
- prefs->GetBoolean(browsing_data::prefs::kDeleteHostedAppsData));
+ prefs_->GetBoolean(browsing_data::prefs::kDeleteHostedAppsData));
origin_types->SetBoolean(
extension_browsing_data_api_constants::kExtensionsKey, false);
// Fill deletion time period.
- int period_pref = prefs->GetInteger(browsing_data::prefs::kDeleteTimePeriod);
+ int period_pref = prefs_->GetInteger(browsing_data::prefs::kDeleteTimePeriod);
browsing_data::TimePeriod period =
static_cast<browsing_data::TimePeriod>(period_pref);
double since = 0;
@@ -162,8 +162,8 @@ bool BrowsingDataSettingsFunction::RunSync() {
std::unique_ptr<base::DictionaryValue> permitted(new base::DictionaryValue);
bool delete_site_data =
- prefs->GetBoolean(browsing_data::prefs::kDeleteCookies) ||
- prefs->GetBoolean(browsing_data::prefs::kDeleteHostedAppsData);
+ prefs_->GetBoolean(browsing_data::prefs::kDeleteCookies) ||
+ prefs_->GetBoolean(browsing_data::prefs::kDeleteHostedAppsData);
SetDetails(selected.get(), permitted.get(),
extension_browsing_data_api_constants::kAppCacheKey,
@@ -194,24 +194,25 @@ bool BrowsingDataSettingsFunction::RunSync() {
delete_site_data);
SetDetails(selected.get(), permitted.get(),
- extension_browsing_data_api_constants::kPluginDataKey,
- delete_site_data && prefs->GetBoolean(prefs::kClearPluginLSODataEnabled));
+ extension_browsing_data_api_constants::kPluginDataKey,
+ delete_site_data &&
+ prefs_->GetBoolean(prefs::kClearPluginLSODataEnabled));
SetDetails(selected.get(), permitted.get(),
extension_browsing_data_api_constants::kHistoryKey,
- prefs->GetBoolean(browsing_data::prefs::kDeleteBrowsingHistory));
+ prefs_->GetBoolean(browsing_data::prefs::kDeleteBrowsingHistory));
SetDetails(selected.get(), permitted.get(),
extension_browsing_data_api_constants::kDownloadsKey,
- prefs->GetBoolean(browsing_data::prefs::kDeleteDownloadHistory));
+ prefs_->GetBoolean(browsing_data::prefs::kDeleteDownloadHistory));
SetDetails(selected.get(), permitted.get(),
extension_browsing_data_api_constants::kCacheKey,
- prefs->GetBoolean(browsing_data::prefs::kDeleteCache));
+ prefs_->GetBoolean(browsing_data::prefs::kDeleteCache));
SetDetails(selected.get(), permitted.get(),
extension_browsing_data_api_constants::kFormDataKey,
- prefs->GetBoolean(browsing_data::prefs::kDeleteFormData));
+ prefs_->GetBoolean(browsing_data::prefs::kDeleteFormData));
SetDetails(selected.get(), permitted.get(),
extension_browsing_data_api_constants::kPasswordsKey,
- prefs->GetBoolean(browsing_data::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,
@@ -220,8 +221,7 @@ bool BrowsingDataSettingsFunction::RunSync() {
selected.release());
result->Set(extension_browsing_data_api_constants::kDataRemovalPermittedKey,
permitted.release());
- SetResult(std::move(result));
- return true;
+ return RespondNow(OneArgument(std::move(result)));
}
void BrowsingDataSettingsFunction::SetDetails(
@@ -229,8 +229,7 @@ void BrowsingDataSettingsFunction::SetDetails(
base::DictionaryValue* permitted_dict,
const char* data_type,
bool is_selected) {
- bool is_permitted =
- IsRemovalPermitted(MaskForKey(data_type), GetProfile()->GetPrefs());
+ bool is_permitted = IsRemovalPermitted(MaskForKey(data_type), prefs_);
selected_dict->SetBoolean(data_type, is_selected && is_permitted);
permitted_dict->SetBoolean(data_type, is_permitted);
}
« no previous file with comments | « chrome/browser/extensions/api/browsing_data/browsing_data_api.h ('k') | chrome/browser/extensions/api/commands/commands.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698