summaryrefslogtreecommitdiffstats
path: root/extensions/shell/common
diff options
context:
space:
mode:
authorhanxi <hanxi@chromium.org>2014-08-28 07:13:21 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-28 14:14:30 +0000
commitc7e55208cda02430540652a0973071b54a8edb1e (patch)
tree238ae7df0f3e5e23f052ab576a7cbd881d843d1b /extensions/shell/common
parent3074bba6ac72e209f68906839317508f4cbbc53a (diff)
downloadchromium_src-c7e55208cda02430540652a0973071b54a8edb1e.zip
chromium_src-c7e55208cda02430540652a0973071b54a8edb1e.tar.gz
chromium_src-c7e55208cda02430540652a0973071b54a8edb1e.tar.bz2
Move ExtensionWarningService and ExtensionsWarningSet, which are used by webrequest api, to extensions.
This cl resolve the dependencies of ExtensionsWarningSet of chrome strings: - move the declarations of IDS_EXTENSION_WARNINGS_XXX to extensions_strings.grd; - replace the usage of "IDS_PRODUCT_NAME" by creating GetProductName() function in ExtensionsClient and its subclasses. BUG=352293 Review URL: https://codereview.chromium.org/503033002 Cr-Commit-Position: refs/heads/master@{#292378}
Diffstat (limited to 'extensions/shell/common')
-rw-r--r--extensions/shell/common/shell_extensions_client.cc4
-rw-r--r--extensions/shell/common/shell_extensions_client.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/extensions/shell/common/shell_extensions_client.cc b/extensions/shell/common/shell_extensions_client.cc
index 0c5844f..0036219 100644
--- a/extensions/shell/common/shell_extensions_client.cc
+++ b/extensions/shell/common/shell_extensions_client.cc
@@ -104,6 +104,10 @@ ShellExtensionsClient::GetPermissionMessageProvider() const {
return g_permission_message_provider.Get();
}
+const std::string ShellExtensionsClient::GetProductName() {
+ return "app_shell";
+}
+
scoped_ptr<FeatureProvider> ShellExtensionsClient::CreateFeatureProvider(
const std::string& name) const {
scoped_ptr<FeatureProvider> provider;
diff --git a/extensions/shell/common/shell_extensions_client.h b/extensions/shell/common/shell_extensions_client.h
index 81c5c60..10e6f20 100644
--- a/extensions/shell/common/shell_extensions_client.h
+++ b/extensions/shell/common/shell_extensions_client.h
@@ -22,6 +22,7 @@ class ShellExtensionsClient : public ExtensionsClient {
virtual void Initialize() OVERRIDE;
virtual const PermissionMessageProvider& GetPermissionMessageProvider()
const OVERRIDE;
+ virtual const std::string GetProductName() OVERRIDE;
virtual scoped_ptr<FeatureProvider> CreateFeatureProvider(
const std::string& name) const OVERRIDE;
virtual scoped_ptr<JSONFeatureProviderSource> CreateFeatureProviderSource(