chrome/browser/extensions/extension_system_impl.cc - Issue 503033002: Move ExtensionWarningService and ExtensionsWarningSet to extensions.

Unified Diff: chrome/browser/extensions/extension_system_impl.cc

Issue 503033002: Move ExtensionWarningService and ExtensionsWarningSet to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@3_web_view_internal

Patch Set: Rename. Created 6 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

« chrome/browser/extensions/api/web_request/web_request_api_helpers.cc ('K') | « chrome/browser/extensions/extension_system_impl.h ('k') | chrome/browser/extensions/extension_warning_badge_service.h » ('j') | chrome/browser/extensions/extension_warning_badge_service_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_system_impl.cc

diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc

index 3e1748044d6e06d0e951ce4a5bfc14b31864ca15..346db37cbf8db04f4943f2ab81d5c4d04e7714a2 100644

--- a/chrome/browser/extensions/extension_system_impl.cc

+++ b/chrome/browser/extensions/extension_system_impl.cc

@@ -24,7 +24,6 @@

#include "chrome/browser/extensions/extension_system_factory.h"

#include "chrome/browser/extensions/extension_util.h"

#include "chrome/browser/extensions/extension_warning_badge_service.h"

-#include "chrome/browser/extensions/extension_warning_set.h"

#include "chrome/browser/extensions/install_verifier.h"

#include "chrome/browser/extensions/navigation_observer.h"

#include "chrome/browser/extensions/shared_module_service.h"

@@ -59,6 +58,7 @@

#include "extensions/browser/quota_service.h"

#include "extensions/browser/runtime_data.h"

#include "extensions/browser/state_store.h"

+#include "extensions/browser/warning_set.h"

James Cook 2014/08/26 22:01:31 nit: Should this also include warning_service.h?

Xi Han 2014/08/27 13:32:54 Added.

#include "extensions/common/constants.h"

#include "extensions/common/extension.h"

#include "extensions/common/manifest.h"

@@ -383,7 +383,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {

// Make the chrome://extension-icon/ resource available.

content::URLDataSource::Add(profile_, new ExtensionIconSource(profile_));

- extension_warning_service_.reset(new ExtensionWarningService(profile_));

+ extension_warning_service_.reset(new WarningService(profile_));

James Cook 2014/08/26 22:01:31 nit: I would rename the variable to just warning_s

Xi Han 2014/08/27 13:32:54 Done.

extension_warning_badge_service_.reset(

new ExtensionWarningBadgeService(profile_));

extension_warning_service_->AddObserver(

@@ -461,7 +461,7 @@ EventRouter* ExtensionSystemImpl::Shared::event_router() {

return event_router_.get();

}

-ExtensionWarningService* ExtensionSystemImpl::Shared::warning_service() {

+WarningService* ExtensionSystemImpl::Shared::warning_service() {

return extension_warning_service_.get();

}

@@ -579,7 +579,7 @@ EventRouter* ExtensionSystemImpl::event_router() {

return shared_->event_router();

}

-ExtensionWarningService* ExtensionSystemImpl::warning_service() {

+WarningService* ExtensionSystemImpl::warning_service() {

return shared_->warning_service();

}