diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-01 01:15:53 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-01 01:15:53 +0000 |
| commit | bb8558a3ce708090430615cb69f696c096ee8ac7 (patch) | |
| tree | b73ed9415abcdd338bacd628fb992a8dd2da5787 /content/browser/plugin_process_host.cc | |
| parent | 5f28eb4ad6cd3c061561e3b84f8e364ff1b487d0 (diff) | |
| download | chromium_src-bb8558a3ce708090430615cb69f696c096ee8ac7.zip chromium_src-bb8558a3ce708090430615cb69f696c096ee8ac7.tar.gz chromium_src-bb8558a3ce708090430615cb69f696c096ee8ac7.tar.bz2 | |
Revert 260678 "Make http range requests by plugins also go direc..."
Causing mac debug bot assert.
> Make http range requests by plugins also go directly to the browser process instead of going through the renderers.
>
> BUG=286074
> R=ananta@chromium.org
>
> Review URL: https://codereview.chromium.org/217593003
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/220323003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_process_host.cc')
| -rw-r--r-- | content/browser/plugin_process_host.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index b6d54b9..8aa69dd 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -205,9 +205,15 @@ bool PluginProcessHost::Init(const WebPluginInfo& info) { // any associated values) if present in the browser command line static const char* const kSwitchNames[] = { switches::kDisableBreakpad, - switches::kDisableDirectNPAPIRequests, +#if defined(OS_MACOSX) + switches::kDisableCoreAnimationPlugins, + switches::kEnableSandboxLogging, +#endif switches::kEnableStatsTable, switches::kFullMemoryCrashReport, +#if defined(OS_WIN) + switches::kHighDPISupport, +#endif switches::kLoggingLevel, switches::kLogPluginMessages, switches::kNoSandbox, @@ -215,13 +221,6 @@ bool PluginProcessHost::Init(const WebPluginInfo& info) { switches::kTestSandbox, switches::kTraceStartup, switches::kUseGL, -#if defined(OS_MACOSX) - switches::kDisableCoreAnimationPlugins, - switches::kEnableSandboxLogging, -#endif -#if defined(OS_WIN) - switches::kHighDPISupport, -#endif }; cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |