Merge lp:~abreu-alexandre/oxide/file-picker-done-guard into lp:~oxide-developers/oxide/oxide.trunk

[Alexandre Abreu]

Add guard for file picker done

Add guard for file picker done

[Chris Coulson (chrisccoulson)]

Haven't I already reviewed this change with a request to add a test for it?

[Chris Coulson (chrisccoulson)]

review: Needs Fixing

[Alexandre Abreu (abreu-alexandre)]

> Haven't I already reviewed this change with a request to add a test for it?

Did you already? ... I couldn't find another branch for that,

I'll add a test,

[Chris Coulson (chrisccoulson)]

> > Haven't I already reviewed this change with a request to add a test for it?
>
> Did you already? ... I couldn't find another branch for that,
>
> I'll add a test,

It was your branch :)

The review URL was https://code.launchpad.net/~abreu-alexandre/oxide/filepicker-accept-nullcheck/+merge/264833, but it seems to have disappeared now. I approved it around July last year with a comment that it should be committed with a test.

[Alexandre Abreu (abreu-alexandre)]

> > > Haven't I already reviewed this change with a request to add a test for
> it?
> >
> > Did you already? ... I couldn't find another branch for that,
> >
> > I'll add a test,
>
> It was your branch :)
>
> The review URL was https://code.launchpad.net/~abreu-alexandre/oxide
> /filepicker-accept-nullcheck/+merge/264833, but it seems to have disappeared
> now. I approved it around July last year with a comment that it should be
> committed with a test.

Right ! ... I re-stumbled on that issue this week, not sure why the branch is not there anymore,

Unmerged revisions

1351. By Alexandre Abreu on 2016-02-17

Add guard for file picker done()

=== modified file 'shared/browser/oxide_file_picker.cc'
--- shared/browser/oxide_file_picker.cc	2015-04-09 22:24:01 +0000
+++ shared/browser/oxide_file_picker.cc	2016-02-17 17:55:19 +0000
@@ -47,6 +47,9 @@
 
 void FilePicker::Done(const std::vector<content::FileChooserFileInfo>& files,
                       content::FileChooserParams::Mode permissions) {
+  if (! render_view_host_) {
+    return;
+  }
   render_view_host_->FilesSelectedInChooser(files, permissions);
   render_view_host_ = nullptr;
   Hide();