Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(280)

Unified Diff: content/browser/browser_plugin/browser_plugin_guest.cc

Issue 280833003: <webview>: Move Color Chooser and File Chooser to Chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_downloads_to_chorme
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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() {
« no previous file with comments | « chrome/browser/guest_view/web_view/web_view_guest.cc ('k') | content/public/browser/browser_plugin_guest_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698