diff options
| author | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-02 02:08:01 +0000 |
|---|---|---|
| committer | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-02 02:08:01 +0000 |
| commit | f9631ea6205338186d8fd4c04b8afdc53afc7147 (patch) | |
| tree | e4e863b47a03f7dadae7a4ae572e03a3d1e99741 | |
| parent | 4b839ee2e1bdf58970aa7fc34173cd56465bbb4a (diff) | |
| download | chromium_src-f9631ea6205338186d8fd4c04b8afdc53afc7147.zip chromium_src-f9631ea6205338186d8fd4c04b8afdc53afc7147.tar.gz chromium_src-f9631ea6205338186d8fd4c04b8afdc53afc7147.tar.bz2 | |
Merge 219957 "Update the extension ID of TimeScape app in the wh..."
> Update the extension ID of TimeScape app in the whitelist to access local file
>
> The extension ID of TimeScape app has been changed. This patch updates the ID in the whitelist to access restricted native local filesystem.
>
> BUG=262265
> TEST=tested manually
> R=satorux@chromium.org
>
> Review URL: https://codereview.chromium.org/23540003
TBR=yoshiki@chromium.org
Review URL: https://codereview.chromium.org/23604018
git-svn-id: svn://svn.chromium.org/chrome/branches/1599/src@220775 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/fileapi/file_system_backend.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/fileapi/file_system_backend.cc b/chrome/browser/chromeos/fileapi/file_system_backend.cc index 43a62c1..fdb8a55 100644 --- a/chrome/browser/chromeos/fileapi/file_system_backend.cc +++ b/chrome/browser/chromeos/fileapi/file_system_backend.cc @@ -144,7 +144,7 @@ bool FileSystemBackend::IsAccessAllowed( std::string extension_id = origin_url.host(); // TODO(mtomasz): Temporarily whitelist TimeScapes. Remove this in M-31. // See: crbug.com/271946 - if (extension_id == "mppoamgbcpnkpacolchbacppkflagjbp" && + if (extension_id == "mlbmkoenclnokonejhlfakkeabdlmpek" && url.type() == fileapi::kFileSystemTypeRestrictedNativeLocal) { return true; } |