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

Unified Diff: chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm

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: better fix for constrained windows 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/browser/ui/views/constrained_window_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm
diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm
index 387328ebc9093d0500759c972df8defd85bf632d..096fba85aa9d57eb59821f3cdd4fddf6b28f2581 100644
--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm
+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm
@@ -14,7 +14,7 @@
#include "components/web_modal/web_contents_modal_dialog_manager.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_contents.h"
-#include "extensions/browser/guest_view/web_view/web_view_guest.h"
+#include "extensions/browser/guest_view/guest_view_base.h"
using web_modal::WebContentsModalDialogManager;
using web_modal::NativeWebContentsModalDialog;
@@ -28,12 +28,12 @@ ConstrainedWindowMac::ConstrainedWindowMac(
sheet_([sheet retain]),
shown_(false) {
DCHECK(web_contents);
- extensions::WebViewGuest* web_view_guest =
- extensions::WebViewGuest::FromWebContents(web_contents);
+ extensions::GuestViewBase* guest_view =
+ extensions::GuestViewBase::FromWebContents(web_contents);
// For embedded WebContents, use the embedder's WebContents for constrained
// window.
- web_contents_ = web_view_guest && web_view_guest->embedder_web_contents() ?
- web_view_guest->embedder_web_contents() : web_contents;
+ web_contents_ = guest_view && guest_view->embedder_web_contents() ?
+ guest_view->embedder_web_contents() : web_contents;
DCHECK(sheet_.get());
web_modal::PopupManager* popup_manager =
web_modal::PopupManager::FromWebContents(web_contents_);
« no previous file with comments | « chrome/browser/resources/pdf/pdf.js ('k') | chrome/browser/ui/views/constrained_window_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698