Whitelist the fileSystem.write API for an internally developed extension

Whitelist the fileSystem.write API for an internally developed extension

BUG=179010
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=192867

[asargent_no_longer_on_chrome, 2013-04-08 06:16:48]

Ping
On Apr 3, 2013 4:35 PM, <asargent@chromium.org> wrote:

> Reviewers: benwells,
>
> Description:
> Whitelist the fileSystem.write API for an internally developed extension
>
> BUG=179010
>
> Please review this at
https://codereview.chromium.**org/13473016/<https://codereview.chromium.org/1...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>   M chrome/browser/extensions/api/**file_system/file_system_api.cc
>   M chrome/common/extensions/api/_**permission_features.json
>
>
> Index: chrome/browser/extensions/api/**file_system/file_system_api.cc
> diff --git a/chrome/browser/extensions/**api/file_system/file_system_**api.cc
> b/chrome/browser/extensions/**api/file_system/file_system_**api.cc
> index 7e2a29a5a72e9f8fd45f7f290f0910**ce455231ef..**
> 3bb588ae564d0d71af24d7dfb7a378**50594c7dda 100644
> --- a/chrome/browser/extensions/**api/file_system/file_system_**api.cc
> +++ b/chrome/browser/extensions/**api/file_system/file_system_**api.cc
> @@ -485,21 +485,31 @@ bool FileSystemChooseEntryFunction:**:ShowPicker(
>      const ui::SelectFileDialog::**FileTypeInfo& file_type_info,
>      ui::SelectFileDialog::Type picker_type,
>      EntryType entry_type) {
> -  ShellWindowRegistry* registry = ShellWindowRegistry::Get(**profile());
> -  DCHECK(registry);
> -  ShellWindow* shell_window = registry->**GetShellWindowForRenderViewHos*
> *t(
> -      render_view_host());
> -  if (!shell_window) {
> -    error_ = kInvalidCallingPage;
> -    return false;
> +  // TODO(asargent/benwells) - As a short term remediation for
> crbug.com/179010
> +  // we're adding the ability for a whitelisted extension to use this API
> since
> +  // chrome.fileBrowserHandler.**selectFile is ChromeOS-only. Eventually
> we'd
> +  // like a better solution and likely this code will go back to being
> +  // platform-app only.
> +  content::WebContents* web_contents = NULL;
> +  if (extension_->is_platform_app()**) {
> +    ShellWindowRegistry* registry = ShellWindowRegistry::Get(**
> profile());
> +    DCHECK(registry);
> +    ShellWindow* shell_window = registry->**
> GetShellWindowForRenderViewHos**t(
> +        render_view_host());
> +    if (!shell_window) {
> +      error_ = kInvalidCallingPage;
> +      return false;
> +    }
> +    web_contents = shell_window->web_contents();
> +  } else {
> +    web_contents = GetAssociatedWebContents();
>    }
> -
>    // The file picker will hold a reference to this function instance,
> preventing
>    // its destruction (and subsequent sending of the function response)
> until the
>    // user has selected a file or cancelled the picker. At that point, the
> picker
>    // will delete itself, which will also free the function instance.
> -  new FilePicker(this, shell_window->web_contents(), suggested_name,
> -      file_type_info, picker_type, entry_type);
> +  new FilePicker(this, web_contents, suggested_name, file_type_info,
> +                 picker_type, entry_type);
>    return true;
>  }
>
> Index: chrome/common/extensions/api/_**permission_features.json
> diff --git a/chrome/common/extensions/**api/_permission_features.json
> b/chrome/common/extensions/**api/_permission_features.json
> index ed4585f49cfe459b7bce63820efead**2912ed336d..**
> 7159da32f39dd2980b2560a52eb784**c4d2a6eead 100644
> --- a/chrome/common/extensions/**api/_permission_features.json
> +++ b/chrome/common/extensions/**api/_permission_features.json
> @@ -167,14 +167,22 @@
>      "extension_types": ["extension", "packaged_app"],
>      "location": "component"
>    },
> -  "fileSystem": {
> +  "fileSystem": [{
>      "channel": "stable",
>      "extension_types": ["platform_app"]
> -  },
> -  "fileSystem.write": {
> +  },{
> +    "channel": "stable",
> +    "extension_types": ["extension"],
> +    "whitelist": [ "**2FC374607C2DF285634B67C64A2E35**6C607091C3" ]
> +  }],
> +  "fileSystem.write": [{
>      "channel": "stable",
>      "extension_types": ["platform_app"]
> -  },
> +  },{
> +    "channel": "stable",
> +    "extension_types": ["extension"],
> +    "whitelist": [ "**2FC374607C2DF285634B67C64A2E35**6C607091C3" ]
> +  }],
>    "fontSettings": {
>      "channel": "stable",
>      "extension_types": ["extension", "packaged_app"]
>
>
>

[benwells, 2013-04-08 10:22:52]

lgtm

[commit-bot: I haz the power, 2013-04-08 15:10:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/asargent@chromium.org/13473016/4001

[commit-bot: I haz the power, 2013-04-08 15:18:31]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_chromeos_clang.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-04-08 15:58:48]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/asargent@chromium.org/13473016/16002

[commit-bot: I haz the power, 2013-04-08 16:07:25]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_chromeos_clang.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-04-08 18:30:50]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/asargent@chromium.org/13473016/16002

[commit-bot: I haz the power, 2013-04-08 19:59:24]

Change committed as 192867