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 "components/constrained_window/constrained_window_views.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "chrome/browser/ui/browser_finder.h" | 9 #include "components/constrained_window/constrained_window_views_client.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/guest_view_base.h" | |
13 #include "ui/views/border.h" | 12 #include "ui/views/border.h" |
14 #include "ui/views/widget/widget.h" | 13 #include "ui/views/widget/widget.h" |
15 #include "ui/views/widget/widget_observer.h" | 14 #include "ui/views/widget/widget_observer.h" |
16 #include "ui/views/window/dialog_delegate.h" | 15 #include "ui/views/window/dialog_delegate.h" |
17 | 16 |
18 using web_modal::ModalDialogHost; | 17 using web_modal::ModalDialogHost; |
19 using web_modal::ModalDialogHostObserver; | 18 using web_modal::ModalDialogHostObserver; |
20 | 19 |
21 namespace { | 20 namespace { |
21 | |
22 ConstrainedWindowViewsClient* client_ = NULL; | |
msw
2014/10/22 21:32:43
nit: should this be |g_client|?
oshima
2014/10/22 22:39:09
Technically speaking, this is not global variable
msw
2014/10/23 18:49:05
Hmm, maybe just |constrained_window_views_client|
oshima
2014/10/23 20:54:47
Done.
| |
23 | |
22 // The name of a key to store on the window handle to associate | 24 // The name of a key to store on the window handle to associate |
23 // BrowserModalDialogHostObserverViews with the Widget. | 25 // WidgetModalDialogHostObserverViews with the Widget. |
24 const char* const kBrowserModalDialogHostObserverViewsKey = | 26 const char* const kWidgetModalDialogHostObserverViewsKey = |
25 "__BROWSER_MODAL_DIALOG_HOST_OBSERVER_VIEWS__"; | 27 "__WIDGET_MODAL_DIALOG_HOST_OBSERVER_VIEWS__"; |
26 | 28 |
27 // Applies positioning changes from the ModalDialogHost to the Widget. | 29 // Applies positioning changes from the ModalDialogHost to the Widget. |
28 class BrowserModalDialogHostObserverViews | 30 class WidgetModalDialogHostObserverViews |
29 : public views::WidgetObserver, | 31 : public views::WidgetObserver, |
30 public ModalDialogHostObserver { | 32 public ModalDialogHostObserver { |
31 public: | 33 public: |
32 BrowserModalDialogHostObserverViews(ModalDialogHost* host, | 34 WidgetModalDialogHostObserverViews(ModalDialogHost* host, |
33 views::Widget* target_widget, | 35 views::Widget* target_widget, |
34 const char *const native_window_property) | 36 const char *const native_window_property) |
35 : host_(host), | 37 : host_(host), |
36 target_widget_(target_widget), | 38 target_widget_(target_widget), |
37 native_window_property_(native_window_property) { | 39 native_window_property_(native_window_property) { |
38 DCHECK(host_); | 40 DCHECK(host_); |
39 DCHECK(target_widget_); | 41 DCHECK(target_widget_); |
40 host_->AddObserver(this); | 42 host_->AddObserver(this); |
41 target_widget_->AddObserver(this); | 43 target_widget_->AddObserver(this); |
42 } | 44 } |
43 | 45 |
44 virtual ~BrowserModalDialogHostObserverViews() { | 46 virtual ~WidgetModalDialogHostObserverViews() { |
45 if (host_) | 47 if (host_) |
46 host_->RemoveObserver(this); | 48 host_->RemoveObserver(this); |
47 target_widget_->RemoveObserver(this); | 49 target_widget_->RemoveObserver(this); |
48 target_widget_->SetNativeWindowProperty(native_window_property_, NULL); | 50 target_widget_->SetNativeWindowProperty(native_window_property_, NULL); |
49 } | 51 } |
50 | 52 |
51 // WidgetObserver overrides | 53 // WidgetObserver overrides |
52 virtual void OnWidgetClosing(views::Widget* widget) override { | 54 virtual void OnWidgetClosing(views::Widget* widget) override { |
53 delete this; | 55 delete this; |
54 } | 56 } |
55 | 57 |
56 // WebContentsModalDialogHostObserver overrides | 58 // WebContentsModalDialogHostObserver overrides |
57 virtual void OnPositionRequiresUpdate() override { | 59 virtual void OnPositionRequiresUpdate() override { |
58 UpdateBrowserModalDialogPosition(target_widget_, host_); | 60 UpdateWidgetModalDialogPosition(target_widget_, host_); |
59 } | 61 } |
60 | 62 |
61 virtual void OnHostDestroying() override { | 63 virtual void OnHostDestroying() override { |
62 host_->RemoveObserver(this); | 64 host_->RemoveObserver(this); |
63 host_ = NULL; | 65 host_ = NULL; |
64 } | 66 } |
65 | 67 |
66 private: | 68 private: |
67 ModalDialogHost* host_; | 69 ModalDialogHost* host_; |
68 views::Widget* target_widget_; | 70 views::Widget* target_widget_; |
69 const char* const native_window_property_; | 71 const char* const native_window_property_; |
70 | 72 |
71 DISALLOW_COPY_AND_ASSIGN(BrowserModalDialogHostObserverViews); | 73 DISALLOW_COPY_AND_ASSIGN(WidgetModalDialogHostObserverViews); |
72 }; | 74 }; |
73 | 75 |
74 void UpdateModalDialogPosition(views::Widget* widget, | 76 void UpdateModalDialogPosition(views::Widget* widget, |
75 web_modal::ModalDialogHost* dialog_host, | 77 web_modal::ModalDialogHost* dialog_host, |
76 const gfx::Size& size) { | 78 const gfx::Size& size) { |
77 // Do not forcibly update the dialog widget position if it is being dragged. | 79 // Do not forcibly update the dialog widget position if it is being dragged. |
78 if (widget->HasCapture()) | 80 if (widget->HasCapture()) |
79 return; | 81 return; |
80 | 82 |
81 gfx::Point position = dialog_host->GetDialogPosition(size); | 83 gfx::Point position = dialog_host->GetDialogPosition(size); |
82 views::Border* border = widget->non_client_view()->frame_view()->border(); | 84 views::Border* border = widget->non_client_view()->frame_view()->border(); |
83 // Border may be null during widget initialization. | 85 // Border may be null during widget initialization. |
84 if (border) { | 86 if (border) { |
85 // Align the first row of pixels inside the border. This is the apparent | 87 // Align the first row of pixels inside the border. This is the apparent |
86 // top of the dialog. | 88 // top of the dialog. |
87 position.set_y(position.y() - border->GetInsets().top()); | 89 position.set_y(position.y() - border->GetInsets().top()); |
88 } | 90 } |
89 | 91 |
90 if (widget->is_top_level()) { | 92 if (widget->is_top_level()) { |
91 position += | 93 position += |
92 views::Widget::GetWidgetForNativeView(dialog_host->GetHostView())-> | 94 views::Widget::GetWidgetForNativeView(dialog_host->GetHostView())-> |
93 GetClientAreaBoundsInScreen().OffsetFromOrigin(); | 95 GetClientAreaBoundsInScreen().OffsetFromOrigin(); |
94 } | 96 } |
95 | 97 |
96 widget->SetBounds(gfx::Rect(position, size)); | 98 widget->SetBounds(gfx::Rect(position, size)); |
97 } | 99 } |
98 | 100 |
99 } // namespace | 101 } // namespace |
100 | 102 |
103 // static | |
104 void SetConstrainedWindowViewsClient( | |
105 scoped_ptr<ConstrainedWindowViewsClient> client) { | |
106 delete client_; | |
107 client_ = client.release(); | |
108 } | |
109 | |
101 void UpdateWebContentsModalDialogPosition( | 110 void UpdateWebContentsModalDialogPosition( |
102 views::Widget* widget, | 111 views::Widget* widget, |
103 web_modal::WebContentsModalDialogHost* dialog_host) { | 112 web_modal::WebContentsModalDialogHost* dialog_host) { |
104 gfx::Size size = widget->GetRootView()->GetPreferredSize(); | 113 gfx::Size size = widget->GetRootView()->GetPreferredSize(); |
105 gfx::Size max_size = dialog_host->GetMaximumDialogSize(); | 114 gfx::Size max_size = dialog_host->GetMaximumDialogSize(); |
106 // Enlarge the max size by the top border, as the dialog will be shifted | 115 // Enlarge the max size by the top border, as the dialog will be shifted |
107 // outside the area specified by the dialog host by this amount later. | 116 // outside the area specified by the dialog host by this amount later. |
108 views::Border* border = | 117 views::Border* border = |
109 widget->non_client_view()->frame_view()->border(); | 118 widget->non_client_view()->frame_view()->border(); |
110 // Border may be null during widget initialization. | 119 // Border may be null during widget initialization. |
111 if (border) | 120 if (border) |
112 max_size.Enlarge(0, border->GetInsets().top()); | 121 max_size.Enlarge(0, border->GetInsets().top()); |
113 size.SetToMin(max_size); | 122 size.SetToMin(max_size); |
114 UpdateModalDialogPosition(widget, dialog_host, size); | 123 UpdateModalDialogPosition(widget, dialog_host, size); |
115 } | 124 } |
116 | 125 |
117 void UpdateBrowserModalDialogPosition(views::Widget* widget, | 126 void UpdateWidgetModalDialogPosition(views::Widget* widget, |
118 web_modal::ModalDialogHost* dialog_host) { | 127 web_modal::ModalDialogHost* dialog_host) { |
msw
2014/10/22 21:32:43
nit fix indent
oshima
2014/10/22 22:39:09
Done.
| |
119 UpdateModalDialogPosition(widget, dialog_host, | 128 UpdateModalDialogPosition(widget, dialog_host, |
120 widget->GetRootView()->GetPreferredSize()); | 129 widget->GetRootView()->GetPreferredSize()); |
121 } | 130 } |
122 | 131 |
123 views::Widget* ShowWebModalDialogViews( | 132 views::Widget* ShowWebModalDialogViews( |
124 views::WidgetDelegate* dialog, | 133 views::WidgetDelegate* dialog, |
125 content::WebContents* initiator_web_contents) { | 134 content::WebContents* initiator_web_contents) { |
126 extensions::GuestViewBase* guest_view = | 135 DCHECK(client_); |
127 extensions::GuestViewBase::FromWebContents(initiator_web_contents); | |
128 // For embedded WebContents, use the embedder's WebContents for constrained | 136 // For embedded WebContents, use the embedder's WebContents for constrained |
129 // window. | 137 // window. |
130 content::WebContents* web_contents = | 138 content::WebContents* web_contents = |
131 guest_view && guest_view->embedder_web_contents() ? | 139 client_->GetEmbedderWebContents(initiator_web_contents); |
132 guest_view->embedder_web_contents() : initiator_web_contents; | |
133 views::Widget* widget = CreateWebModalDialogViews(dialog, web_contents); | 140 views::Widget* widget = CreateWebModalDialogViews(dialog, web_contents); |
134 web_modal::PopupManager* popup_manager = | 141 web_modal::PopupManager* popup_manager = |
135 web_modal::PopupManager::FromWebContents(web_contents); | 142 web_modal::PopupManager::FromWebContents(web_contents); |
136 popup_manager->ShowModalDialog(widget->GetNativeWindow(), web_contents); | 143 popup_manager->ShowModalDialog(widget->GetNativeWindow(), web_contents); |
137 return widget; | 144 return widget; |
138 } | 145 } |
139 | 146 |
140 views::Widget* CreateWebModalDialogViews(views::WidgetDelegate* dialog, | 147 views::Widget* CreateWebModalDialogViews(views::WidgetDelegate* dialog, |
141 content::WebContents* web_contents) { | 148 content::WebContents* web_contents) { |
142 DCHECK_EQ(ui::MODAL_TYPE_CHILD, dialog->GetModalType()); | 149 DCHECK_EQ(ui::MODAL_TYPE_CHILD, dialog->GetModalType()); |
143 web_modal::PopupManager* popup_manager = | 150 web_modal::PopupManager* popup_manager = |
144 web_modal::PopupManager::FromWebContents(web_contents); | 151 web_modal::PopupManager::FromWebContents(web_contents); |
145 const gfx::NativeWindow parent = popup_manager->GetHostView(); | 152 const gfx::NativeWindow parent = popup_manager->GetHostView(); |
146 return views::DialogDelegate::CreateDialogWidget(dialog, NULL, parent); | 153 return views::DialogDelegate::CreateDialogWidget(dialog, NULL, parent); |
147 } | 154 } |
148 | 155 |
149 // TODO(gbillock): Replace this with PopupManager calls. | 156 // TODO(gbillock): Replace this with PopupManager calls. |
150 views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog, | 157 views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog, |
151 gfx::NativeWindow parent) { | 158 gfx::NativeWindow parent) { |
152 views::Widget* widget = | 159 views::Widget* widget = |
153 views::DialogDelegate::CreateDialogWidget(dialog, NULL, parent); | 160 views::DialogDelegate::CreateDialogWidget(dialog, NULL, parent); |
154 if (!dialog->UseNewStyleForThisDialog()) | 161 if (!dialog->UseNewStyleForThisDialog()) |
155 return widget; | 162 return widget; |
156 | 163 DCHECK(client_); |
157 // Get the browser dialog management and hosting components from |parent|. | 164 ModalDialogHost* host = client_->GetModalDialogHost(parent); |
158 Browser* browser = chrome::FindBrowserWithWindow(parent); | 165 if (host) { |
159 if (browser) { | |
160 ChromeWebModalDialogManagerDelegate* manager = browser; | |
161 ModalDialogHost* host = manager->GetWebContentsModalDialogHost(); | |
162 DCHECK_EQ(parent, host->GetHostView()); | 166 DCHECK_EQ(parent, host->GetHostView()); |
163 ModalDialogHostObserver* dialog_host_observer = | 167 ModalDialogHostObserver* dialog_host_observer = |
msw
2014/10/22 21:32:43
Huh, what's the ownership story here? Is this inte
oshima
2014/10/22 22:39:09
it's owned by the widget and deleted in OnWidgetCl
msw
2014/10/23 18:49:05
Acknowledged.
| |
164 new BrowserModalDialogHostObserverViews( | 168 new WidgetModalDialogHostObserverViews( |
165 host, widget, kBrowserModalDialogHostObserverViewsKey); | 169 host, widget, kWidgetModalDialogHostObserverViewsKey); |
166 dialog_host_observer->OnPositionRequiresUpdate(); | 170 dialog_host_observer->OnPositionRequiresUpdate(); |
167 } | 171 } |
168 return widget; | 172 return widget; |
169 } | 173 } |
OLD | NEW |