diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 21:14:19 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 21:14:19 +0000 |
| commit | b3d935d6a41b6f605edd2f9766e354a9d01e6a41 (patch) | |
| tree | 83ec0d96e4f9c6a487f80ebd5c3da1760d19ace1 | |
| parent | 61c3bdfb212783d14a9716676f0dfec2435db15a (diff) | |
| download | chromium_src-b3d935d6a41b6f605edd2f9766e354a9d01e6a41.zip chromium_src-b3d935d6a41b6f605edd2f9766e354a9d01e6a41.tar.gz chromium_src-b3d935d6a41b6f605edd2f9766e354a9d01e6a41.tar.bz2 | |
Merge 121587 - Fix sandbox policy for windows flash
So flash deployed via component update also run in the sandbox.
AppData\Local\Google\Chrome SxS\User Data\NPAPIFlash\gcswf32.dll
BUG=113733
TEST=see bug
Review URL: http://codereview.chromium.org/9382026
TBR=cpu@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9358072
git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@121935 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/chrome_content_client.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc index 1a0c7c8..0f89d4d 100644 --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc @@ -376,7 +376,7 @@ bool ChromeContentClient::SandboxPlugin(CommandLine* command_line, return false; FilePath plugin_path(plugin_dll); - if (plugin_path != builtin_flash) + if (plugin_path.BaseName() != builtin_flash.BaseName()) return false; if (base::win::GetVersion() <= base::win::VERSION_XP || |