content/shell/browser/shell_content_browser_client.h - Issue 1248363003: Merge M45: Remove NPAPI command line flags entirely.

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: content/shell/browser/shell_content_browser_client.h

Issue 1248363003: Merge M45: Remove NPAPI command line flags entirely. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2454

Patch Set: Created 5 years, 5 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:

Index: content/shell/browser/shell_content_browser_client.h

diff --git a/content/shell/browser/shell_content_browser_client.h b/content/shell/browser/shell_content_browser_client.h

index fedd055666105e1bee814acbec885e48a264ad88..1a579eb56af700f0a0847a6ac2f228312ec26bc5 100644

--- a/content/shell/browser/shell_content_browser_client.h

+++ b/content/shell/browser/shell_content_browser_client.h

@@ -44,6 +44,7 @@ class ShellContentBrowserClient : public ContentBrowserClient {

ProtocolHandlerMap* protocol_handlers,

URLRequestInterceptorScopedVector request_interceptors) override;

bool IsHandledURL(const GURL& url) override;

+ bool IsNPAPIEnabled() override;

void AppendExtraCommandLineSwitches(base::CommandLine* command_line,

int child_process_id) override;

void OverrideWebkitPrefs(RenderViewHost* render_view_host,