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

Unified Diff: chrome/browser/extensions/api/content_settings/content_settings_api.cc

Issue 11747025: Run the JSON Schema Compiler's bundle compilation on JSON files. Previously it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix ms release build Created 7 years, 11 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/content_settings/content_settings_api.cc
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
index 87c179891bd6c91f4e4e90714b0bb972dd6dccab..e1c4a089b8fa13c089e6cbba7e85d0c72ee3eebe 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
@@ -62,7 +62,7 @@ namespace extensions {
namespace helpers = content_settings_helpers;
namespace keys = content_settings_api_constants;
-bool ClearContentSettingsFunction::RunImpl() {
+bool ContentSettingsClearFunction::RunImpl() {
ContentSettingsType content_type;
EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
@@ -96,7 +96,7 @@ bool ClearContentSettingsFunction::RunImpl() {
return true;
}
-bool GetContentSettingFunction::RunImpl() {
+bool ContentSettingsGetFunction::RunImpl() {
ContentSettingsType content_type;
EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
@@ -169,7 +169,7 @@ bool GetContentSettingFunction::RunImpl() {
return true;
}
-bool SetContentSettingFunction::RunImpl() {
+bool ContentSettingsSetFunction::RunImpl() {
ContentSettingsType content_type;
EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
@@ -250,7 +250,7 @@ bool SetContentSettingFunction::RunImpl() {
return true;
}
-bool GetResourceIdentifiersFunction::RunImpl() {
+bool ContentSettingsGetResourceIdentifiersFunction::RunImpl() {
ContentSettingsType content_type;
EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
@@ -261,14 +261,15 @@ bool GetResourceIdentifiersFunction::RunImpl() {
if (!g_testing_plugins_) {
PluginService::GetInstance()->GetPlugins(
- base::Bind(&GetResourceIdentifiersFunction::OnGotPlugins, this));
+ base::Bind(&ContentSettingsGetResourceIdentifiersFunction::OnGotPlugins,
+ this));
} else {
OnGotPlugins(*g_testing_plugins_);
}
return true;
}
-void GetResourceIdentifiersFunction::OnGotPlugins(
+void ContentSettingsGetResourceIdentifiersFunction::OnGotPlugins(
const std::vector<webkit::WebPluginInfo>& plugins) {
PluginFinder* finder = PluginFinder::GetInstance();
std::set<std::string> group_identifiers;
@@ -289,11 +290,13 @@ void GetResourceIdentifiersFunction::OnGotPlugins(
SetResult(list);
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE, base::Bind(
- &GetResourceIdentifiersFunction::SendResponse, this, true));
+ &ContentSettingsGetResourceIdentifiersFunction::SendResponse,
+ this,
+ true));
}
// static
-void GetResourceIdentifiersFunction::SetPluginsForTesting(
+void ContentSettingsGetResourceIdentifiersFunction::SetPluginsForTesting(
const std::vector<webkit::WebPluginInfo>* plugins) {
g_testing_plugins_ = plugins;
}

Powered by Google App Engine
This is Rietveld 408576698