diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-13 00:22:46 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-13 00:22:46 +0000 |
| commit | 74dccee8d1c3cc4517c3fdd3fb414bfb845c5025 (patch) | |
| tree | cb9c4c6c717a970fe1ef20c2cf7a961eb62bb16d /chrome/plugin | |
| parent | c1c0af544088729db7f863db1b10a25503a3a09d (diff) | |
| download | chromium_src-74dccee8d1c3cc4517c3fdd3fb414bfb845c5025.zip chromium_src-74dccee8d1c3cc4517c3fdd3fb414bfb845c5025.tar.gz chromium_src-74dccee8d1c3cc4517c3fdd3fb414bfb845c5025.tar.bz2 | |
Enable sandboxed flash on windows by default.
It requires flash 10.1.103.19 or better, the current
flash in trunk is 10.1.103.20 so we are fine.
BUG=50796
TEST=see bug
Review URL: http://codereview.chromium.org/4870001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66022 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
| -rw-r--r-- | chrome/plugin/plugin_main.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc index f2aff2f..e72c4e2 100644 --- a/chrome/plugin/plugin_main.cc +++ b/chrome/plugin/plugin_main.cc @@ -109,8 +109,8 @@ int PluginMain(const MainFunctionParams& parameters) { << parsed_command_line.command_line_string(); HMODULE sandbox_test_module = NULL; - bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox) || - !parsed_command_line.HasSwitch(switches::kSafePlugins); + bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox); + if (target_services && !no_sandbox) { // The command line might specify a test plugin to load. if (parsed_command_line.HasSwitch(switches::kTestSandbox)) { |