chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc - Issue 831813004: Get nacl building again for android

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/plugins/chrome_content_browser_client_plugins_part.cc

Issue 831813004: Get nacl building again for android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove process launcher change Created 5 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

« chrome/browser/nacl_host/nacl_browser_delegate_impl.cc ('K') | « chrome/browser/nacl_host/nacl_browser_delegate_impl.cc ('k') | chrome/common/pepper_permission_util.cc » ('j') | chrome/common/pepper_permission_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc

diff --git a/chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc b/chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc

index 853c8a77d679f8de8e1a6116bb851697b83a4bcc..5491372a2a477a732c3b19489124fdfa42ed9b75 100644

--- a/chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc

+++ b/chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc

@@ -66,8 +66,8 @@ bool ChromeContentBrowserClientPluginsPart::AllowPepperSocketAPI(

bool private_api,

const content::SocketPermissionRequest* params,

const std::set<std::string>& allowed_socket_origin) {

- Profile* profile = Profile::FromBrowserContext(browser_context);

#if defined(ENABLE_EXTENSIONS)

+ Profile* profile = Profile::FromBrowserContext(browser_context);

const extensions::ExtensionSet* extension_set = NULL;

if (profile) {

extension_set =