| Index: content/browser/browser_plugin/browser_plugin_guest.cc
|
| diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
|
| index d1edaafe3ada7552137e97a7e7d40a1f6c9b49fe..199ae2b3b9309a4a950aa401a39cad2f9eef6c76 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() {
|
|
|