diff options
| author | fsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-14 06:44:41 +0000 |
|---|---|---|
| committer | fsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-14 06:44:41 +0000 |
| commit | c54341134bf266b76b99b2e81e5a1469fc4a76d8 (patch) | |
| tree | 8e8ae43cd3dc1ba8e0bee7e15b6f428a097236e4 /content/browser/browser_plugin/browser_plugin_guest.cc | |
| parent | e8ba11614fcc5835c64ad5d279391022dfe65fbd (diff) | |
| download | chromium_src-c54341134bf266b76b99b2e81e5a1469fc4a76d8.zip chromium_src-c54341134bf266b76b99b2e81e5a1469fc4a76d8.tar.gz chromium_src-c54341134bf266b76b99b2e81e5a1469fc4a76d8.tar.bz2 | |
<webview>: Move Color Chooser and File Chooser to Chrome
BUG=364141, 330264
Review URL: https://codereview.chromium.org/280833003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270348 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_plugin/browser_plugin_guest.cc')
| -rw-r--r-- | content/browser/browser_plugin/browser_plugin_guest.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc index 9d90519..4ad5382 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.cc +++ b/content/browser/browser_plugin/browser_plugin_guest.cc @@ -633,10 +633,9 @@ ColorChooser* BrowserPluginGuest::OpenColorChooser( WebContents* web_contents, SkColor color, const std::vector<ColorSuggestion>& suggestions) { - if (!embedder_web_contents_ || !embedder_web_contents_->GetDelegate()) + if (!delegate_) return NULL; - return embedder_web_contents_->GetDelegate()->OpenColorChooser( - web_contents, color, suggestions); + return delegate_->OpenColorChooser(web_contents, color, suggestions); } bool BrowserPluginGuest::HandleContextMenu(const ContextMenuParams& params) { @@ -765,13 +764,9 @@ void BrowserPluginGuest::RendererResponsive(WebContents* source) { void BrowserPluginGuest::RunFileChooser(WebContents* web_contents, const FileChooserParams& params) { - if (!attached()) - return; - - if (!embedder_web_contents_->GetDelegate()) + if (!delegate_) return; - - embedder_web_contents_->GetDelegate()->RunFileChooser(web_contents, params); + delegate_->RunFileChooser(web_contents, params); } bool BrowserPluginGuest::ShouldFocusPageAfterCrash() { |