chrome/app/chrome_main_delegate.cc - Issue 1318143002: Always use ENABLE_PLUGINS to indicate plugins support.

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/app/chrome_main_delegate.cc

Issue 1318143002: Always use ENABLE_PLUGINS to indicate plugins support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: simplify content_browsertests.isolate Created 5 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

Index: chrome/app/chrome_main_delegate.cc

diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc

index 8b6457c202be4e75f20ef6d245d73b61bbf18646..eb876775af90f0005af0b9f670767d2acdb55b05 100644

--- a/chrome/app/chrome_main_delegate.cc

+++ b/chrome/app/chrome_main_delegate.cc

@@ -810,7 +810,7 @@ void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) {

nacl_plugin::PPP_InitializeModule,

nacl_plugin::PPP_ShutdownModule);

#endif

-#if defined(ENABLE_PLUGINS)

+#if defined(ENABLE_PLUGINS) && !defined(OS_ANDROID)

ChromeContentClient::SetPDFEntryFunctions(

chrome_pdf::PPP_GetInterface,

chrome_pdf::PPP_InitializeModule,

« no previous file with comments | « no previous file | chrome/browser/browser_resources.grd » ('j') | chrome/common/chrome_content_client.cc » ('J')