chrome/browser/extensions/api/tabs/windows_event_router.cc - Issue 25366003: Moved some functions off ExtensionService into a new file extension_util.

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/tabs/windows_event_router.cc

Issue 25366003: Moved some functions off ExtensionService into a new file extension_util. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Windows compile Created 7 years, 2 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/preference/preference_helpers.cc ('k') | chrome/browser/extensions/context_menu_matcher.cc » ('j') | chrome/browser/extensions/extension_prefs.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/tabs/windows_event_router.cc

diff --git a/chrome/browser/extensions/api/tabs/windows_event_router.cc b/chrome/browser/extensions/api/tabs/windows_event_router.cc

index 1f90f45e568144dcb30c99f1da9e2af344292849..adc9a078897b36799f1b9ed8724d89de63571d95 100644

--- a/chrome/browser/extensions/api/tabs/windows_event_router.cc

+++ b/chrome/browser/extensions/api/tabs/windows_event_router.cc

@@ -9,6 +9,7 @@

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

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

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

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

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

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

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

@@ -115,8 +116,9 @@ static void WillDispatchWindowFocusedEvent(Profile* new_active_profile,

// can't see the new focused window across the incognito boundary.

// See crbug.com/46610.

if (new_active_profile && new_active_profile != profile &&

- !extensions::ExtensionSystem::Get(profile)->extension_service()->

- CanCrossIncognito(extension)) {

+ !extension_util::CanCrossIncognito(

+ extension,

+ extensions::ExtensionSystem::Get(profile)->extension_service())) {

event_args->Clear();

event_args->Append(new base::FundamentalValue(

extension_misc::kUnknownWindowId));