chrome/common/chrome_content_client.cc - Issue 525513003: Cleanup: Put more plugin code behind the ENABLE_PLUGINS ifdef.

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/common/chrome_content_client.cc

Issue 525513003: Cleanup: Put more plugin code behind the ENABLE_PLUGINS ifdef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase, fix gn for reals Created 6 years, 3 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/common/chrome_content_client.cc

diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc

index da0e5ed6e2c51dcae844edb016b0783ab0cf7169..9e46c3a397ae4409903671bb5bd16f45fdea3b2a 100644

--- a/chrome/common/chrome_content_client.cc

+++ b/chrome/common/chrome_content_client.cc

@@ -26,7 +26,6 @@

#include "components/dom_distiller/core/url_constants.h"

#include "content/public/common/content_constants.h"

#include "content/public/common/content_switches.h"

-#include "content/public/common/pepper_plugin_info.h"

#include "content/public/common/url_constants.h"

#include "content/public/common/user_agent.h"

#include "extensions/common/constants.h"

@@ -53,6 +52,7 @@

#if defined(ENABLE_PLUGINS)

#include "chrome/common/pepper_flash.h"

+#include "content/public/common/pepper_plugin_info.h"

#include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR.

#include "ppapi/shared_impl/ppapi_permissions.h"

#endif

« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | content/renderer/render_thread_impl.cc » ('J')