summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_system_impl.h
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 /chrome/browser/extensions/extension_system_impl.h
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 'chrome/browser/extensions/extension_system_impl.h')
-rw-r--r--chrome/browser/extensions/extension_system_impl.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_system_impl.h b/chrome/browser/extensions/extension_system_impl.h
index 2f1eddc..8b0b39e 100644
--- a/chrome/browser/extensions/extension_system_impl.h
+++ b/chrome/browser/extensions/extension_system_impl.h
@@ -49,7 +49,7 @@ class ExtensionSystemImpl : public ExtensionSystem {
OVERRIDE; // shared
virtual InfoMap* info_map() OVERRIDE; // shared
virtual EventRouter* event_router() OVERRIDE; // shared
- virtual ExtensionWarningService* warning_service() OVERRIDE;
+ virtual WarningService* warning_service() OVERRIDE;
virtual Blacklist* blacklist() OVERRIDE; // shared
virtual ErrorConsole* error_console() OVERRIDE;
virtual InstallVerifier* install_verifier() OVERRIDE;
@@ -100,7 +100,7 @@ class ExtensionSystemImpl : public ExtensionSystem {
InfoMap* info_map();
LazyBackgroundTaskQueue* lazy_background_task_queue();
EventRouter* event_router();
- ExtensionWarningService* warning_service();
+ WarningService* warning_service();
ErrorConsole* error_console();
InstallVerifier* install_verifier();
QuotaService* quota_service();
@@ -141,7 +141,7 @@ class ExtensionSystemImpl : public ExtensionSystem {
scoped_ptr<ManagementPolicy> management_policy_;
// extension_info_map_ needs to outlive process_manager_.
scoped_refptr<InfoMap> extension_info_map_;
- scoped_ptr<ExtensionWarningService> extension_warning_service_;
+ scoped_ptr<WarningService> warning_service_;
scoped_ptr<ExtensionWarningBadgeService> extension_warning_badge_service_;
scoped_ptr<ErrorConsole> error_console_;
scoped_ptr<InstallVerifier> install_verifier_;