OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/website_settings/chooser_bubble_ui_view.h" | 5 #include "chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <string> | 10 #include <string> |
11 #include <vector> | 11 #include <vector> |
12 | 12 |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
14 #include "base/memory/ptr_util.h" | 14 #include "base/memory/ptr_util.h" |
15 #include "base/strings/string16.h" | 15 #include "base/strings/string16.h" |
16 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
17 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
18 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
19 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" | 19 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" |
20 #include "chrome/browser/ui/views/frame/browser_view.h" | 20 #include "chrome/browser/ui/views/frame/browser_view.h" |
21 #include "chrome/browser/ui/views/frame/top_container_view.h" | 21 #include "chrome/browser/ui/views/frame/top_container_view.h" |
22 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 22 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
23 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" | 23 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" |
24 #include "chrome/browser/ui/website_settings/chooser_bubble_controller.h" | 24 #include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h" |
25 #include "chrome/common/pref_names.h" | 25 #include "chrome/common/pref_names.h" |
26 #include "chrome/grit/generated_resources.h" | 26 #include "chrome/grit/generated_resources.h" |
| 27 #include "components/bubble/bubble_controller.h" |
27 #include "components/prefs/pref_service.h" | 28 #include "components/prefs/pref_service.h" |
| 29 #include "components/ui/chooser_controller/chooser_controller.h" |
28 #include "components/url_formatter/elide_url.h" | 30 #include "components/url_formatter/elide_url.h" |
29 #include "ui/accessibility/ax_view_state.h" | 31 #include "ui/accessibility/ax_view_state.h" |
30 #include "ui/base/l10n/l10n_util.h" | 32 #include "ui/base/l10n/l10n_util.h" |
31 #include "ui/base/resource/resource_bundle.h" | 33 #include "ui/base/resource/resource_bundle.h" |
32 #include "ui/gfx/paint_vector_icon.h" | 34 #include "ui/gfx/paint_vector_icon.h" |
33 #include "ui/gfx/text_constants.h" | 35 #include "ui/gfx/text_constants.h" |
34 #include "ui/gfx/vector_icons_public.h" | 36 #include "ui/gfx/vector_icons_public.h" |
35 #include "ui/views/bubble/bubble_dialog_delegate.h" | 37 #include "ui/views/bubble/bubble_dialog_delegate.h" |
36 #include "ui/views/bubble/bubble_frame_view.h" | 38 #include "ui/views/bubble/bubble_frame_view.h" |
37 #include "ui/views/controls/styled_label.h" | 39 #include "ui/views/controls/styled_label.h" |
38 #include "ui/views/controls/styled_label_listener.h" | 40 #include "ui/views/controls/styled_label_listener.h" |
39 #include "ui/views/controls/table/table_view.h" | 41 #include "ui/views/controls/table/table_view.h" |
40 #include "ui/views/controls/table/table_view_observer.h" | 42 #include "ui/views/controls/table/table_view_observer.h" |
41 #include "ui/views/layout/grid_layout.h" | 43 #include "ui/views/layout/grid_layout.h" |
42 #include "ui/views/window/dialog_client_view.h" | 44 #include "ui/views/window/dialog_client_view.h" |
43 #include "url/origin.h" | 45 #include "url/origin.h" |
44 | 46 |
45 namespace { | 47 namespace { |
46 | 48 |
47 // Chooser permission bubble width | 49 // Chooser permission bubble width |
48 const int kChooserPermissionBubbleWidth = 300; | 50 const int kChooserPermissionBubbleWidth = 300; |
49 | 51 |
50 // Chooser permission bubble height | 52 // Chooser permission bubble height |
51 const int kChooserPermissionBubbleHeight = 200; | 53 const int kChooserPermissionBubbleHeight = 200; |
52 | 54 |
53 } // namespace | 55 } // namespace |
54 | 56 |
55 std::unique_ptr<BubbleUi> ChooserBubbleController::BuildBubbleUi() { | 57 std::unique_ptr<BubbleUi> ChooserBubbleDelegate::BuildBubbleUi() { |
56 return base::WrapUnique(new ChooserBubbleUiView(browser_, this)); | 58 return base::WrapUnique( |
| 59 new ChooserBubbleUiView(browser_, chooser_controller())); |
57 } | 60 } |
58 | 61 |
59 class ChooserTableModel; | 62 class ChooserTableModel; |
60 | 63 |
61 /////////////////////////////////////////////////////////////////////////////// | 64 /////////////////////////////////////////////////////////////////////////////// |
62 // View implementation for the chooser bubble. | 65 // View implementation for the chooser bubble. |
63 class ChooserBubbleUiViewDelegate : public views::BubbleDialogDelegateView, | 66 class ChooserBubbleUiViewDelegate : public views::BubbleDialogDelegateView, |
64 public views::StyledLabelListener, | 67 public views::StyledLabelListener, |
65 public views::TableViewObserver { | 68 public views::TableViewObserver { |
66 public: | 69 public: |
67 ChooserBubbleUiViewDelegate(views::View* anchor_view, | 70 ChooserBubbleUiViewDelegate(views::View* anchor_view, |
68 views::BubbleBorder::Arrow anchor_arrow, | 71 views::BubbleBorder::Arrow anchor_arrow, |
69 ChooserBubbleController* controller); | 72 ChooserController* controller, |
| 73 BubbleReference bubble_reference); |
70 ~ChooserBubbleUiViewDelegate() override; | 74 ~ChooserBubbleUiViewDelegate() override; |
71 | 75 |
72 // views::BubbleDialogDelegateView: | 76 // views::BubbleDialogDelegateView: |
73 bool ShouldShowWindowTitle() const override; | 77 bool ShouldShowWindowTitle() const override; |
74 base::string16 GetWindowTitle() const override; | 78 base::string16 GetWindowTitle() const override; |
75 base::string16 GetDialogButtonLabel(ui::DialogButton button) const override; | 79 base::string16 GetDialogButtonLabel(ui::DialogButton button) const override; |
76 bool IsDialogButtonEnabled(ui::DialogButton button) const override; | 80 bool IsDialogButtonEnabled(ui::DialogButton button) const override; |
77 views::View* CreateFootnoteView() override; | 81 views::View* CreateFootnoteView() override; |
78 bool Accept() override; | 82 bool Accept() override; |
79 bool Cancel() override; | 83 bool Cancel() override; |
(...skipping 13 matching lines...) Expand all Loading... |
93 views::BubbleBorder::Arrow anchor_arrow); | 97 views::BubbleBorder::Arrow anchor_arrow); |
94 | 98 |
95 // Called by ChooserBubbleUiView's destructor. When ChooserBubbleUiView object | 99 // Called by ChooserBubbleUiView's destructor. When ChooserBubbleUiView object |
96 // is destroyed, the |controller_| it passed to this class may not be used any | 100 // is destroyed, the |controller_| it passed to this class may not be used any |
97 // more since it may be destroyed too. | 101 // more since it may be destroyed too. |
98 void ControllerDestroying(); | 102 void ControllerDestroying(); |
99 | 103 |
100 ChooserTableModel* chooser_table_model() const; | 104 ChooserTableModel* chooser_table_model() const; |
101 | 105 |
102 private: | 106 private: |
103 ChooserBubbleController* controller_; | 107 ChooserController* controller_; |
| 108 BubbleReference bubble_reference_; |
104 | 109 |
105 views::TableView* table_view_; | 110 views::TableView* table_view_; |
106 ChooserTableModel* chooser_table_model_; | 111 ChooserTableModel* chooser_table_model_; |
107 | 112 |
108 DISALLOW_COPY_AND_ASSIGN(ChooserBubbleUiViewDelegate); | 113 DISALLOW_COPY_AND_ASSIGN(ChooserBubbleUiViewDelegate); |
109 }; | 114 }; |
110 | 115 |
111 ui::TableColumn ChooserTableColumn(int id, const std::string& title) { | 116 ui::TableColumn ChooserTableColumn(int id, const std::string& title) { |
112 ui::TableColumn column; | 117 ui::TableColumn column; |
113 column.id = id; | 118 column.id = id; |
114 column.title = base::ASCIIToUTF16(title.c_str()); | 119 column.title = base::ASCIIToUTF16(title.c_str()); |
115 return column; | 120 return column; |
116 } | 121 } |
117 | 122 |
118 class ChooserTableModel : public ui::TableModel, | 123 class ChooserTableModel : public ui::TableModel, |
119 public ChooserBubbleController::Observer { | 124 public ChooserController::Observer { |
120 public: | 125 public: |
121 explicit ChooserTableModel(ChooserBubbleController* controller); | 126 explicit ChooserTableModel(ChooserController* controller); |
122 | 127 |
123 // ui::TableModel: | 128 // ui::TableModel: |
124 int RowCount() override; | 129 int RowCount() override; |
125 base::string16 GetText(int row, int column_id) override; | 130 base::string16 GetText(int row, int column_id) override; |
126 void SetObserver(ui::TableModelObserver* observer) override; | 131 void SetObserver(ui::TableModelObserver* observer) override; |
127 | 132 |
128 // ChooserBubbleController::Observer: | 133 // ChooserController::Observer: |
129 void OnOptionsInitialized() override; | 134 void OnOptionsInitialized() override; |
130 void OnOptionAdded(size_t index) override; | 135 void OnOptionAdded(size_t index) override; |
131 void OnOptionRemoved(size_t index) override; | 136 void OnOptionRemoved(size_t index) override; |
132 | 137 |
133 void Update(); | 138 void Update(); |
134 | 139 |
135 private: | 140 private: |
136 ui::TableModelObserver* observer_; | 141 ui::TableModelObserver* observer_; |
137 ChooserBubbleController* controller_; | 142 ChooserController* controller_; |
138 }; | 143 }; |
139 | 144 |
140 ChooserBubbleUiViewDelegate::ChooserBubbleUiViewDelegate( | 145 ChooserBubbleUiViewDelegate::ChooserBubbleUiViewDelegate( |
141 views::View* anchor_view, | 146 views::View* anchor_view, |
142 views::BubbleBorder::Arrow anchor_arrow, | 147 views::BubbleBorder::Arrow anchor_arrow, |
143 ChooserBubbleController* controller) | 148 ChooserController* controller, |
| 149 BubbleReference bubble_reference) |
144 : views::BubbleDialogDelegateView(anchor_view, anchor_arrow), | 150 : views::BubbleDialogDelegateView(anchor_view, anchor_arrow), |
145 controller_(controller) { | 151 controller_(controller), |
| 152 bubble_reference_(bubble_reference) { |
146 // ------------------------------------ | 153 // ------------------------------------ |
147 // | Chooser bubble title | | 154 // | Chooser bubble title | |
148 // | -------------------------------- | | 155 // | -------------------------------- | |
149 // | | option 0 | | | 156 // | | option 0 | | |
150 // | | option 1 | | | 157 // | | option 1 | | |
151 // | | option 2 | | | 158 // | | option 2 | | |
152 // | | | | | 159 // | | | | |
153 // | | | | | 160 // | | | | |
154 // | | | | | 161 // | | | | |
155 // | -------------------------------- | | 162 // | -------------------------------- | |
156 // | [ Connect ] [ Cancel ] | | 163 // | [ Connect ] [ Cancel ] | |
157 // |----------------------------------| | 164 // |----------------------------------| |
158 // | Not seeing your device? Get help | | 165 // | Not seeing your device? Get help | |
159 // ------------------------------------ | 166 // ------------------------------------ |
160 | 167 |
| 168 DCHECK(bubble_reference_); |
| 169 |
161 views::GridLayout* layout = new views::GridLayout(this); | 170 views::GridLayout* layout = new views::GridLayout(this); |
162 SetLayoutManager(layout); | 171 SetLayoutManager(layout); |
163 | 172 |
164 views::ColumnSet* column_set = layout->AddColumnSet(0); | 173 views::ColumnSet* column_set = layout->AddColumnSet(0); |
165 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, | 174 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, |
166 views::GridLayout::USE_PREF, 0, 0); | 175 views::GridLayout::USE_PREF, 0, 0); |
167 | 176 |
168 // Lay out the table view. | 177 // Lay out the table view. |
169 layout->StartRow(0, 0); | 178 layout->StartRow(0, 0); |
170 std::vector<ui::TableColumn> table_columns; | 179 std::vector<ui::TableColumn> table_columns; |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
221 IDS_CHOOSER_BUBBLE_FOOTNOTE_TEXT, link, &offset); | 230 IDS_CHOOSER_BUBBLE_FOOTNOTE_TEXT, link, &offset); |
222 views::StyledLabel* label = new views::StyledLabel(text, this); | 231 views::StyledLabel* label = new views::StyledLabel(text, this); |
223 label->AddStyleRange(gfx::Range(offset, offset + link.length()), | 232 label->AddStyleRange(gfx::Range(offset, offset + link.length()), |
224 views::StyledLabel::RangeStyleInfo::CreateForLink()); | 233 views::StyledLabel::RangeStyleInfo::CreateForLink()); |
225 return label; | 234 return label; |
226 } | 235 } |
227 | 236 |
228 bool ChooserBubbleUiViewDelegate::Accept() { | 237 bool ChooserBubbleUiViewDelegate::Accept() { |
229 if (controller_) | 238 if (controller_) |
230 controller_->Select(table_view_->selection_model().active()); | 239 controller_->Select(table_view_->selection_model().active()); |
| 240 bubble_reference_->CloseBubble(BUBBLE_CLOSE_ACCEPTED); |
231 return true; | 241 return true; |
232 } | 242 } |
233 | 243 |
234 bool ChooserBubbleUiViewDelegate::Cancel() { | 244 bool ChooserBubbleUiViewDelegate::Cancel() { |
235 if (controller_) | 245 if (controller_) |
236 controller_->Cancel(); | 246 controller_->Cancel(); |
| 247 bubble_reference_->CloseBubble(BUBBLE_CLOSE_CANCELED); |
237 return true; | 248 return true; |
238 } | 249 } |
239 | 250 |
240 bool ChooserBubbleUiViewDelegate::Close() { | 251 bool ChooserBubbleUiViewDelegate::Close() { |
241 if (controller_) | 252 if (controller_) |
242 controller_->Close(); | 253 controller_->Close(); |
243 return true; | 254 return true; |
244 } | 255 } |
245 | 256 |
246 void ChooserBubbleUiViewDelegate::StyledLabelLinkClicked( | 257 void ChooserBubbleUiViewDelegate::StyledLabelLinkClicked( |
(...skipping 20 matching lines...) Expand all Loading... |
267 } | 278 } |
268 | 279 |
269 void ChooserBubbleUiViewDelegate::ControllerDestroying() { | 280 void ChooserBubbleUiViewDelegate::ControllerDestroying() { |
270 controller_ = nullptr; | 281 controller_ = nullptr; |
271 } | 282 } |
272 | 283 |
273 ChooserTableModel* ChooserBubbleUiViewDelegate::chooser_table_model() const { | 284 ChooserTableModel* ChooserBubbleUiViewDelegate::chooser_table_model() const { |
274 return chooser_table_model_; | 285 return chooser_table_model_; |
275 } | 286 } |
276 | 287 |
277 ChooserTableModel::ChooserTableModel(ChooserBubbleController* controller) | 288 ChooserTableModel::ChooserTableModel(ChooserController* controller) |
278 : observer_(nullptr), controller_(controller) { | 289 : observer_(nullptr), controller_(controller) { |
279 controller_->set_observer(this); | 290 controller_->set_observer(this); |
280 } | 291 } |
281 | 292 |
282 int ChooserTableModel::RowCount() { | 293 int ChooserTableModel::RowCount() { |
283 // When there are no devices, the table contains a message saying there | 294 // When there are no devices, the table contains a message saying there |
284 // are no devices, so the number of rows is always at least 1. | 295 // are no devices, so the number of rows is always at least 1. |
285 return std::max(static_cast<int>(controller_->NumOptions()), 1); | 296 return std::max(static_cast<int>(controller_->NumOptions()), 1); |
286 } | 297 } |
287 | 298 |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
331 table_view->SetEnabled(false); | 342 table_view->SetEnabled(false); |
332 } else { | 343 } else { |
333 table_view->SetEnabled(true); | 344 table_view->SetEnabled(true); |
334 } | 345 } |
335 } | 346 } |
336 | 347 |
337 ////////////////////////////////////////////////////////////////////////////// | 348 ////////////////////////////////////////////////////////////////////////////// |
338 // ChooserBubbleUiView | 349 // ChooserBubbleUiView |
339 | 350 |
340 ChooserBubbleUiView::ChooserBubbleUiView(Browser* browser, | 351 ChooserBubbleUiView::ChooserBubbleUiView(Browser* browser, |
341 ChooserBubbleController* controller) | 352 ChooserController* controller) |
342 : browser_(browser), | 353 : browser_(browser), |
343 controller_(controller), | 354 controller_(controller), |
344 chooser_bubble_ui_view_delegate_(nullptr) { | 355 chooser_bubble_ui_view_delegate_(nullptr) { |
345 DCHECK(browser_); | 356 DCHECK(browser_); |
346 DCHECK(controller_); | 357 DCHECK(controller_); |
347 } | 358 } |
348 | 359 |
349 ChooserBubbleUiView::~ChooserBubbleUiView() { | 360 ChooserBubbleUiView::~ChooserBubbleUiView() { |
350 if (chooser_bubble_ui_view_delegate_) | 361 if (chooser_bubble_ui_view_delegate_) |
351 chooser_bubble_ui_view_delegate_->ControllerDestroying(); | 362 chooser_bubble_ui_view_delegate_->ControllerDestroying(); |
352 } | 363 } |
353 | 364 |
354 void ChooserBubbleUiView::Show(BubbleReference /*bubble_reference*/) { | 365 void ChooserBubbleUiView::Show(BubbleReference bubble_reference) { |
355 chooser_bubble_ui_view_delegate_ = new ChooserBubbleUiViewDelegate( | 366 chooser_bubble_ui_view_delegate_ = new ChooserBubbleUiViewDelegate( |
356 GetAnchorView(), GetAnchorArrow(), controller_); | 367 GetAnchorView(), GetAnchorArrow(), controller_, bubble_reference); |
357 | 368 |
358 // Set |parent_window| because some valid anchors can become hidden. | 369 // Set |parent_window| because some valid anchors can become hidden. |
359 views::Widget* widget = views::Widget::GetWidgetForNativeWindow( | 370 views::Widget* widget = views::Widget::GetWidgetForNativeWindow( |
360 browser_->window()->GetNativeWindow()); | 371 browser_->window()->GetNativeWindow()); |
361 chooser_bubble_ui_view_delegate_->set_parent_window(widget->GetNativeView()); | 372 chooser_bubble_ui_view_delegate_->set_parent_window(widget->GetNativeView()); |
362 | 373 |
363 views::BubbleDialogDelegateView::CreateBubble( | 374 views::BubbleDialogDelegateView::CreateBubble( |
364 chooser_bubble_ui_view_delegate_) | 375 chooser_bubble_ui_view_delegate_) |
365 ->Show(); | 376 ->Show(); |
366 | 377 |
(...skipping 17 matching lines...) Expand all Loading... |
384 return browser_view->exclusive_access_bubble()->GetView(); | 395 return browser_view->exclusive_access_bubble()->GetView(); |
385 | 396 |
386 return browser_view->top_container(); | 397 return browser_view->top_container(); |
387 } | 398 } |
388 | 399 |
389 views::BubbleBorder::Arrow ChooserBubbleUiView::GetAnchorArrow() { | 400 views::BubbleBorder::Arrow ChooserBubbleUiView::GetAnchorArrow() { |
390 if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)) | 401 if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)) |
391 return views::BubbleBorder::TOP_LEFT; | 402 return views::BubbleBorder::TOP_LEFT; |
392 return views::BubbleBorder::NONE; | 403 return views::BubbleBorder::NONE; |
393 } | 404 } |
OLD | NEW |