OLD | NEW |
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/ui/browser_finder.h" | 9 #include "chrome/browser/ui/browser_finder.h" |
10 #include "components/web_modal/popup_manager.h" | 10 #include "components/web_modal/popup_manager.h" |
11 #include "components/web_modal/web_contents_modal_dialog_host.h" | 11 #include "components/web_modal/web_contents_modal_dialog_host.h" |
12 #include "extensions/browser/guest_view/web_view/web_view_guest.h" | 12 #include "extensions/browser/guest_view/guest_view_base.h" |
13 #include "ui/views/border.h" | 13 #include "ui/views/border.h" |
14 #include "ui/views/widget/widget.h" | 14 #include "ui/views/widget/widget.h" |
15 #include "ui/views/widget/widget_observer.h" | 15 #include "ui/views/widget/widget_observer.h" |
16 #include "ui/views/window/dialog_delegate.h" | 16 #include "ui/views/window/dialog_delegate.h" |
17 | 17 |
18 using web_modal::ModalDialogHost; | 18 using web_modal::ModalDialogHost; |
19 using web_modal::ModalDialogHostObserver; | 19 using web_modal::ModalDialogHostObserver; |
20 | 20 |
21 namespace { | 21 namespace { |
22 // The name of a key to store on the window handle to associate | 22 // The name of a key to store on the window handle to associate |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 | 116 |
117 void UpdateBrowserModalDialogPosition(views::Widget* widget, | 117 void UpdateBrowserModalDialogPosition(views::Widget* widget, |
118 web_modal::ModalDialogHost* dialog_host) { | 118 web_modal::ModalDialogHost* dialog_host) { |
119 UpdateModalDialogPosition(widget, dialog_host, | 119 UpdateModalDialogPosition(widget, dialog_host, |
120 widget->GetRootView()->GetPreferredSize()); | 120 widget->GetRootView()->GetPreferredSize()); |
121 } | 121 } |
122 | 122 |
123 views::Widget* ShowWebModalDialogViews( | 123 views::Widget* ShowWebModalDialogViews( |
124 views::WidgetDelegate* dialog, | 124 views::WidgetDelegate* dialog, |
125 content::WebContents* initiator_web_contents) { | 125 content::WebContents* initiator_web_contents) { |
126 extensions::WebViewGuest* web_view_guest = | 126 extensions::GuestViewBase* guest_view = |
127 extensions::WebViewGuest::FromWebContents(initiator_web_contents); | 127 extensions::GuestViewBase::FromWebContents(initiator_web_contents); |
128 // For embedded WebContents, use the embedder's WebContents for constrained | 128 // For embedded WebContents, use the embedder's WebContents for constrained |
129 // window. | 129 // window. |
130 content::WebContents* web_contents = | 130 content::WebContents* web_contents = |
131 web_view_guest && web_view_guest->embedder_web_contents() ? | 131 guest_view && guest_view->embedder_web_contents() ? |
132 web_view_guest->embedder_web_contents() : initiator_web_contents; | 132 guest_view->embedder_web_contents() : initiator_web_contents; |
133 views::Widget* widget = CreateWebModalDialogViews(dialog, web_contents); | 133 views::Widget* widget = CreateWebModalDialogViews(dialog, web_contents); |
134 web_modal::PopupManager* popup_manager = | 134 web_modal::PopupManager* popup_manager = |
135 web_modal::PopupManager::FromWebContents(web_contents); | 135 web_modal::PopupManager::FromWebContents(web_contents); |
136 popup_manager->ShowModalDialog(widget->GetNativeWindow(), web_contents); | 136 popup_manager->ShowModalDialog(widget->GetNativeWindow(), web_contents); |
137 return widget; | 137 return widget; |
138 } | 138 } |
139 | 139 |
140 views::Widget* CreateWebModalDialogViews(views::WidgetDelegate* dialog, | 140 views::Widget* CreateWebModalDialogViews(views::WidgetDelegate* dialog, |
141 content::WebContents* web_contents) { | 141 content::WebContents* web_contents) { |
142 DCHECK_EQ(ui::MODAL_TYPE_CHILD, dialog->GetModalType()); | 142 DCHECK_EQ(ui::MODAL_TYPE_CHILD, dialog->GetModalType()); |
(...skipping 17 matching lines...) Expand all Loading... |
160 ChromeWebModalDialogManagerDelegate* manager = browser; | 160 ChromeWebModalDialogManagerDelegate* manager = browser; |
161 ModalDialogHost* host = manager->GetWebContentsModalDialogHost(); | 161 ModalDialogHost* host = manager->GetWebContentsModalDialogHost(); |
162 DCHECK_EQ(parent, host->GetHostView()); | 162 DCHECK_EQ(parent, host->GetHostView()); |
163 ModalDialogHostObserver* dialog_host_observer = | 163 ModalDialogHostObserver* dialog_host_observer = |
164 new BrowserModalDialogHostObserverViews( | 164 new BrowserModalDialogHostObserverViews( |
165 host, widget, kBrowserModalDialogHostObserverViewsKey); | 165 host, widget, kBrowserModalDialogHostObserverViewsKey); |
166 dialog_host_observer->OnPositionRequiresUpdate(); | 166 dialog_host_observer->OnPositionRequiresUpdate(); |
167 } | 167 } |
168 return widget; | 168 return widget; |
169 } | 169 } |
OLD | NEW |