chrome/browser/extensions/api/web_request/web_request_api.cc - Issue 147923005: Split ExtensionSystem interface from ExtensionSystemImpl implementation, part 1.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/web_request/web_request_api.cc

Issue 147923005: Split ExtensionSystem interface from ExtensionSystemImpl implementation, part 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: re^3base Created 6 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

« no previous file with comments | « chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc ('k') | chrome/browser/extensions/api/web_request/web_request_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/web_request/web_request_api.cc

diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc

index 7061e9fa659cabfc092adbf8aa486262137a53d8..cb7a821dcdbc4f0e811d3cef0c8df2d7af90fcd4 100644

--- a/chrome/browser/extensions/api/web_request/web_request_api.cc

+++ b/chrome/browser/extensions/api/web_request/web_request_api.cc

@@ -31,7 +31,6 @@

#include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h"

#include "chrome/browser/extensions/api/web_request/web_request_time_tracker.h"

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

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

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

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

#include "chrome/browser/profiles/profile.h"

@@ -49,6 +48,7 @@

#include "extensions/browser/event_router.h"

#include "extensions/browser/extension_prefs.h"

#include "extensions/browser/extension_registry.h"

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

#include "extensions/browser/info_map.h"

#include "extensions/browser/runtime_data.h"

#include "extensions/common/error_utils.h"

@@ -403,7 +403,7 @@ namespace extensions {

WebRequestAPI::WebRequestAPI(content::BrowserContext* context)

: browser_context_(context) {

EventRouter* event_router =

- ExtensionSystem::GetForBrowserContext(browser_context_)->event_router();

+ ExtensionSystem::Get(browser_context_)->event_router();

for (size_t i = 0; i < arraysize(kWebRequestEvents); ++i) {

// Observe the webRequest event.

std::string event_name = kWebRequestEvents[i];

@@ -416,7 +416,7 @@ WebRequestAPI::WebRequestAPI(content::BrowserContext* context)

}

WebRequestAPI::~WebRequestAPI() {

- ExtensionSystem::GetForBrowserContext(browser_context_)

+ ExtensionSystem::Get(browser_context_)

->event_router()

->UnregisterObserver(this);

}