chrome/browser/plugin_service.cc - Issue 257029: Add an option to disable NaCl at compile time for platforms where it doesn't build yet

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/plugin_service.cc

Issue 257029: Add an option to disable NaCl at compile time for platforms where it doesn't build yet (Closed)

Patch Set: Created 11 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:

Index: chrome/browser/plugin_service.cc

diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc

index 5c5a8bb488e88278e1d819948f68552510a392c0..fe719522eeb08ea05cea73f51f758bd272377375 100644

--- a/chrome/browser/plugin_service.cc

+++ b/chrome/browser/plugin_service.cc

@@ -23,7 +23,9 @@

#include "chrome/common/notification_type.h"

#include "chrome/common/notification_service.h"

#include "chrome/common/render_messages.h"

+#ifndef DISABLE_NACL

#include "native_client/src/trusted/plugin/nacl_entry_points.h"

+#endif

#include "webkit/glue/plugins/plugin_constants_win.h"

#include "webkit/glue/plugins/plugin_list.h"

@@ -45,8 +47,10 @@ PluginService::PluginService()

NPAPI::PluginList::Singleton()->AddExtraPluginPath(

FilePath::FromWStringHack(path));

}

+#ifndef DISABLE_NACL

if (command_line->HasSwitch(switches::kInternalNaCl))

RegisterInternalNaClPlugin();

+#endif

#if defined(OS_WIN)

hkcu_key_.Create(

« no previous file with comments | « chrome/browser/nacl_process_host.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »