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

Unified Diff: chrome/browser/ui/views/constrained_window_views.cc

Issue 554893002: [WORK_IN_PROGRESS] PDF::Save() fix for out-of-process-pdf. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: with print dialog fix (aura only) Created 6 years, 3 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
« no previous file with comments | « chrome/browser/resources/pdf/pdf.js ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/constrained_window_views.cc
diff --git a/chrome/browser/ui/views/constrained_window_views.cc b/chrome/browser/ui/views/constrained_window_views.cc
index 658e32c254db2bd95a5c2eeadb5592b2040f43da..b0f3768a4376613dd0927c51095a6a10cda8b440 100644
--- a/chrome/browser/ui/views/constrained_window_views.cc
+++ b/chrome/browser/ui/views/constrained_window_views.cc
@@ -10,6 +10,7 @@
#include "components/web_modal/popup_manager.h"
#include "components/web_modal/web_contents_modal_dialog_host.h"
#include "extensions/browser/guest_view/web_view/web_view_guest.h"
+#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
#include "ui/views/border.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_observer.h"
@@ -125,11 +126,18 @@ views::Widget* ShowWebModalDialogViews(
content::WebContents* initiator_web_contents) {
extensions::WebViewGuest* web_view_guest =
extensions::WebViewGuest::FromWebContents(initiator_web_contents);
+ printf("web_view_guest: [%p]\n", web_view_guest);
+
+ extensions::MimeHandlerViewGuest* mime_handler_view_guest =
+ extensions::MimeHandlerViewGuest::FromWebContents(initiator_web_contents);
+ printf("mime_handler_view_guest: [%p]\n", web_view_guest);
// For embedded WebContents, use the embedder's WebContents for constrained
// window.
content::WebContents* web_contents =
web_view_guest && web_view_guest->embedder_web_contents() ?
- web_view_guest->embedder_web_contents() : initiator_web_contents;
+ web_view_guest->embedder_web_contents() :
+ (mime_handler_view_guest && mime_handler_view_guest->embedder_web_contents() ?
+ mime_handler_view_guest->embedder_web_contents() : initiator_web_contents);
views::Widget* widget = CreateWebModalDialogViews(dialog, web_contents);
web_modal::PopupManager* popup_manager =
web_modal::PopupManager::FromWebContents(web_contents);
« no previous file with comments | « chrome/browser/resources/pdf/pdf.js ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698