commit | 796f6dab549a5c883977bfa2f4fa38a7cd5858e9 | [log] [tgz] |
---|---|---|
author | Will Harris <wfh@chromium.org> | Thu Jan 28 23:10:26 2016 |
committer | Will Harris <wfh@chromium.org> | Thu Jan 28 23:11:43 2016 |
tree | 57d76bed1b5d66fb97b71f47b84be7203eca855d | |
parent | 9719a052e54b469f11b4fb51c8e585e7c7c932e5 [diff] |
Merge M49: Change Win32k PPAPI lockdown to use finch params for mime type. BUG=523278 Review URL: https://codereview.chromium.org/1609133002 Cr-Commit-Position: refs/heads/master@{#371651} (cherry picked from commit c91e967e98ace8db59aa9c29b0949603caa51050) Review URL: https://codereview.chromium.org/1645143003 . Cr-Commit-Position: refs/branch-heads/2623@{#179} Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}