chrome/app/chrome_main_delegate.cc - Issue 899033002: Revert of Combine PDF plugin into the Chromium binary.

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 899033002: Revert of Combine PDF plugin into the Chromium binary. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 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 7a840221a2a8c9a388e6313251d705644c1d0c4d..608d513c19c4680b54fb35188c277c32a8432739 100644

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

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

@@ -119,11 +119,6 @@

#include "remoting/client/plugin/pepper_entrypoints.h"

#endif

-#if defined(ENABLE_PLUGINS) && (defined(CHROME_MULTIPLE_DLL_CHILD) || \

- !defined(CHROME_MULTIPLE_DLL_BROWSER))

-#include "pdf/pdf.h"

-#endif

#if !defined(CHROME_MULTIPLE_DLL_BROWSER)

#include "chrome/child/pdf_child_init.h"

@@ -831,12 +826,6 @@

nacl_plugin::PPP_InitializeModule,

nacl_plugin::PPP_ShutdownModule);

#endif

-#if defined(ENABLE_PLUGINS)

- ChromeContentClient::SetPDFEntryFunctions(

- chrome_pdf::PPP_GetInterface,

- chrome_pdf::PPP_InitializeModule,

- chrome_pdf::PPP_ShutdownModule);

-#endif

#endif

}

« no previous file with comments | « chrome/DEPS ('k') | chrome/browser/chromeos/file_manager/open_with_browser.cc » ('j') | no next file with comments »