chrome/browser/extensions/extension_function_dispatcher.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/extension_function_dispatcher.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/extension_browsertest.cc ('k') | chrome/browser/extensions/extension_functional_browsertest.cc » ('j') | chrome/browser/extensions/extension_prefs.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_function_dispatcher.cc

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

index 056dda4b8fd32563e577250d8b63f5b30e5b83cb..d6da6d080303f9ff6af3c9dbfe5ffbcc337e9b84 100644

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

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

@@ -18,6 +18,7 @@

#include "chrome/browser/extensions/extension_function_registry.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/extension_web_ui.h"

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

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

@@ -346,7 +347,8 @@ void ExtensionFunctionDispatcher::DispatchWithCallback(

function_ui->SetRenderViewHost(render_view_host);

function_ui->set_dispatcher(AsWeakPtr());

function_ui->set_profile(profile_);

- function->set_include_incognito(service->CanCrossIncognito(extension));

+ function->set_include_incognito(extension_util::CanCrossIncognito(extension,

+ service));

if (!CheckPermissions(function.get(), extension, params, callback))

return;