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

Unified Diff: chrome/browser/printing/print_preview_dialog_controller.cc

Issue 1102173002: Move GuestView layer in browser to components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test change to build Created 5 years, 8 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: chrome/browser/printing/print_preview_dialog_controller.cc
diff --git a/chrome/browser/printing/print_preview_dialog_controller.cc b/chrome/browser/printing/print_preview_dialog_controller.cc
index 618c3834923445295c0bbeb321a8b704fec055f6..1c10834257ac34835d6fe523a63ca92efe6d0986 100644
--- a/chrome/browser/printing/print_preview_dialog_controller.cc
+++ b/chrome/browser/printing/print_preview_dialog_controller.cc
@@ -25,6 +25,7 @@
#include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/url_constants.h"
+#include "components/guest_view/browser/guest_view_base.h"
#include "components/web_modal/web_contents_modal_dialog_host.h"
#include "content/public/browser/host_zoom_map.h"
#include "content/public/browser/navigation_controller.h"
@@ -35,7 +36,6 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_delegate.h"
-#include "extensions/browser/guest_view/guest_view_base.h"
#include "ui/web_dialogs/web_dialog_delegate.h"
using content::NavigationController;
@@ -101,14 +101,8 @@ void PrintPreviewDialogDelegate::GetDialogSize(gfx::Size* size) const {
*size = kMinDialogSize;
web_modal::WebContentsModalDialogHost* host = NULL;
- content::WebContents* outermost_web_contents = initiator_;
- const extensions::GuestViewBase* guest_view =
- extensions::GuestViewBase::FromWebContents(outermost_web_contents);
- while (guest_view && guest_view->attached()) {
- outermost_web_contents = guest_view->embedder_web_contents();
- guest_view =
- extensions::GuestViewBase::FromWebContents(outermost_web_contents);
- }
+ content::WebContents* outermost_web_contents =
+ guestview::GuestViewBase::GetTopLevelWebContents(initiator_);
Browser* browser = chrome::FindBrowserWithWebContents(outermost_web_contents);
if (browser)
host = browser->window()->GetWebContentsModalDialogHost();

Powered by Google App Engine
This is Rietveld 408576698