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

Side by Side Diff: chrome/browser/ui/views/constrained_window_views.cc

Issue 321193003: Fix print preview dialog for <webview>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mac import Created 6 years, 6 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/views/constrained_window_views.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/constrained_window_views.h" 5 #include "chrome/browser/ui/views/constrained_window_views.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "chrome/browser/guest_view/web_view/web_view_guest.h"
9 #include "chrome/browser/ui/browser_finder.h" 10 #include "chrome/browser/ui/browser_finder.h"
10 #include "components/web_modal/web_contents_modal_dialog_host.h" 11 #include "components/web_modal/web_contents_modal_dialog_host.h"
11 #include "components/web_modal/web_contents_modal_dialog_manager.h" 12 #include "components/web_modal/web_contents_modal_dialog_manager.h"
12 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h" 13 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
13 #include "ui/views/border.h" 14 #include "ui/views/border.h"
14 #include "ui/views/widget/widget.h" 15 #include "ui/views/widget/widget.h"
15 #include "ui/views/widget/widget_observer.h" 16 #include "ui/views/widget/widget_observer.h"
16 #include "ui/views/window/dialog_delegate.h" 17 #include "ui/views/window/dialog_delegate.h"
17 18
18 using web_modal::ModalDialogHost; 19 using web_modal::ModalDialogHost;
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 size.SetToMin(max_size); 114 size.SetToMin(max_size);
114 UpdateModalDialogPosition(widget, dialog_host, size); 115 UpdateModalDialogPosition(widget, dialog_host, size);
115 } 116 }
116 117
117 void UpdateBrowserModalDialogPosition(views::Widget* widget, 118 void UpdateBrowserModalDialogPosition(views::Widget* widget,
118 web_modal::ModalDialogHost* dialog_host) { 119 web_modal::ModalDialogHost* dialog_host) {
119 UpdateModalDialogPosition(widget, dialog_host, 120 UpdateModalDialogPosition(widget, dialog_host,
120 widget->GetRootView()->GetPreferredSize()); 121 widget->GetRootView()->GetPreferredSize());
121 } 122 }
122 123
123 views::Widget* ShowWebModalDialogViews(views::WidgetDelegate* dialog, 124 views::Widget* ShowWebModalDialogViews(
124 content::WebContents* web_contents) { 125 views::WidgetDelegate* dialog,
126 content::WebContents* initiator_web_contents) {
127 WebViewGuest* web_view_guest = WebViewGuest::FromWebContents(
128 initiator_web_contents);
129 // For embedded WebContents, use the embedder's WebContents for constrained
130 // window.
131 content::WebContents* web_contents =
132 web_view_guest && web_view_guest->embedder_web_contents() ?
133 web_view_guest->embedder_web_contents() : initiator_web_contents;
125 views::Widget* widget = CreateWebModalDialogViews(dialog, web_contents); 134 views::Widget* widget = CreateWebModalDialogViews(dialog, web_contents);
126 web_modal::WebContentsModalDialogManager::FromWebContents(web_contents)-> 135 web_modal::WebContentsModalDialogManager::FromWebContents(web_contents)->
127 ShowModalDialog(widget->GetNativeWindow()); 136 ShowModalDialog(widget->GetNativeWindow());
128 return widget; 137 return widget;
129 } 138 }
130 139
131 views::Widget* CreateWebModalDialogViews(views::WidgetDelegate* dialog, 140 views::Widget* CreateWebModalDialogViews(views::WidgetDelegate* dialog,
132 content::WebContents* web_contents) { 141 content::WebContents* web_contents) {
133 DCHECK_EQ(ui::MODAL_TYPE_CHILD, dialog->GetModalType()); 142 DCHECK_EQ(ui::MODAL_TYPE_CHILD, dialog->GetModalType());
134 web_modal::WebContentsModalDialogManager* manager = 143 web_modal::WebContentsModalDialogManager* manager =
(...skipping 16 matching lines...) Expand all
151 ChromeWebModalDialogManagerDelegate* manager = browser; 160 ChromeWebModalDialogManagerDelegate* manager = browser;
152 ModalDialogHost* host = manager->GetWebContentsModalDialogHost(); 161 ModalDialogHost* host = manager->GetWebContentsModalDialogHost();
153 DCHECK_EQ(parent, host->GetHostView()); 162 DCHECK_EQ(parent, host->GetHostView());
154 ModalDialogHostObserver* dialog_host_observer = 163 ModalDialogHostObserver* dialog_host_observer =
155 new BrowserModalDialogHostObserverViews( 164 new BrowserModalDialogHostObserverViews(
156 host, widget, kBrowserModalDialogHostObserverViewsKey); 165 host, widget, kBrowserModalDialogHostObserverViewsKey);
157 dialog_host_observer->OnPositionRequiresUpdate(); 166 dialog_host_observer->OnPositionRequiresUpdate();
158 } 167 }
159 return widget; 168 return widget;
160 } 169 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/constrained_window_views.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698