diff options
| author | sehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 04:02:42 +0000 |
|---|---|---|
| committer | sehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 04:02:42 +0000 |
| commit | 71dd5262b154c103fa48a813fd21dac3cf6b159a (patch) | |
| tree | c9b1bfac5ed2578713bd6c202726b6fbd4c454a1 /chrome/common | |
| parent | 49cd7e88053813e2e5e22f7fb87473342ab8c8b8 (diff) | |
| download | chromium_src-71dd5262b154c103fa48a813fd21dac3cf6b159a.zip chromium_src-71dd5262b154c103fa48a813fd21dac3cf6b159a.tar.gz chromium_src-71dd5262b154c103fa48a813fd21dac3cf6b159a.tar.bz2 | |
Remove the internal-nacl flag.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6250050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73252 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/chrome_switches.cc | 5 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 1 | ||||
| -rw-r--r-- | chrome/common/pepper_plugin_registry.cc | 9 |
3 files changed, 3 insertions, 12 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 43026f4..032c0df 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -536,7 +536,7 @@ const char kEnableMemoryInfo[] = "enable-memory-info"; const char kEnableMonitorProfile[] = "enable-monitor-profile"; // Runs the Native Client inside the renderer process and enables GPU plugin -// (internally adds kInternalNaCl and lEnableGpuPlugin to the command line). +// (internally adds lEnableGpuPlugin to the command line). const char kEnableNaCl[] = "enable-nacl"; // Enables debugging via RSP over a socket. @@ -767,9 +767,6 @@ const char kIncognito[] = "incognito"; // TemplateURL. const char kInstantURL[] = "instant-url"; -// Runs the Native Client inside the renderer process. -const char kInternalNaCl[] = "internal-nacl"; - // Runs a trusted Pepper plugin inside the renderer process. const char kInternalPepper[] = "internal-pepper"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index b6477c2..708a55f 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -219,7 +219,6 @@ extern const char kInProcessPlugins[]; extern const char kInProcessWebGL[]; extern const char kIncognito[]; extern const char kInstantURL[]; -extern const char kInternalNaCl[]; extern const char kInternalPepper[]; extern const char kJavaScriptFlags[]; extern const char kKeepAliveForTest[]; diff --git a/chrome/common/pepper_plugin_registry.cc b/chrome/common/pepper_plugin_registry.cc index dc852d9..26b6409 100644 --- a/chrome/common/pepper_plugin_registry.cc +++ b/chrome/common/pepper_plugin_registry.cc @@ -151,14 +151,9 @@ void PepperPluginRegistry::GetExtraPlugins( } } - // Verify that we enable nacl on the command line. The name of the - // switch varies between the browser and renderer process. - bool enable_nacl = - CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNaCl) || - CommandLine::ForCurrentProcess()->HasSwitch(switches::kInternalNaCl); - static bool skip_nacl_file_check = false; - if (enable_nacl && PathService::Get(chrome::FILE_NACL_PLUGIN, &path)) { + if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNaCl) + && PathService::Get(chrome::FILE_NACL_PLUGIN, &path)) { if (skip_nacl_file_check || file_util::PathExists(path)) { PepperPluginInfo nacl; nacl.path = path; |