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

Side by Side Diff: chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc

Issue 1661063002: Add message and Help Center link to the chooser UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merged changes from master and resolved conflicts Created 4 years, 10 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
OLDNEW
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>
8
7 #include <algorithm> 9 #include <algorithm>
8 #include <string> 10 #include <string>
11 #include <vector>
9 12
10 #include "base/macros.h" 13 #include "base/macros.h"
11 #include "base/strings/string16.h" 14 #include "base/strings/string16.h"
12 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" 17 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h"
15 #include "chrome/browser/ui/views/frame/browser_view.h" 18 #include "chrome/browser/ui/views/frame/browser_view.h"
16 #include "chrome/browser/ui/views/frame/top_container_view.h" 19 #include "chrome/browser/ui/views/frame/top_container_view.h"
17 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 20 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
18 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" 21 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
19 #include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h" 22 #include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h"
20 #include "chrome/common/pref_names.h" 23 #include "chrome/common/pref_names.h"
21 #include "chrome/grit/generated_resources.h" 24 #include "chrome/grit/generated_resources.h"
22 #include "components/prefs/pref_service.h" 25 #include "components/prefs/pref_service.h"
23 #include "ui/accessibility/ax_view_state.h" 26 #include "ui/accessibility/ax_view_state.h"
24 #include "ui/base/l10n/l10n_util.h" 27 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/base/resource/resource_bundle.h" 28 #include "ui/base/resource/resource_bundle.h"
26 #include "ui/gfx/paint_vector_icon.h" 29 #include "ui/gfx/paint_vector_icon.h"
27 #include "ui/gfx/text_constants.h" 30 #include "ui/gfx/text_constants.h"
28 #include "ui/gfx/vector_icons_public.h" 31 #include "ui/gfx/vector_icons_public.h"
29 #include "ui/views/bubble/bubble_delegate.h" 32 #include "ui/views/bubble/bubble_delegate.h"
30 #include "ui/views/bubble/bubble_frame_view.h" 33 #include "ui/views/bubble/bubble_frame_view.h"
31 #include "ui/views/controls/button/label_button.h" 34 #include "ui/views/controls/button/label_button.h"
32 #include "ui/views/controls/button/label_button_border.h" 35 #include "ui/views/controls/button/label_button_border.h"
36 #include "ui/views/controls/separator.h"
37 #include "ui/views/controls/styled_label.h"
38 #include "ui/views/controls/styled_label_listener.h"
33 #include "ui/views/controls/table/table_view.h" 39 #include "ui/views/controls/table/table_view.h"
34 #include "ui/views/controls/table/table_view_observer.h" 40 #include "ui/views/controls/table/table_view_observer.h"
35 #include "ui/views/layout/box_layout.h" 41 #include "ui/views/layout/box_layout.h"
36 #include "ui/views/layout/grid_layout.h" 42 #include "ui/views/layout/grid_layout.h"
43 #include "ui/views/layout/layout_constants.h"
37 44
38 namespace { 45 namespace {
39 46
40 // Chooser permission bubble width 47 // Chooser permission bubble width
41 const int kChooserPermissionBubbleWidth = 300; 48 const int kChooserPermissionBubbleWidth = 300;
42 49
43 // Chooser permission bubble height 50 // Chooser permission bubble height
44 const int kChooserPermissionBubbleHeight = 200; 51 const int kChooserPermissionBubbleHeight = 200;
45 52
46 // Spacing constant for outer margin. This is added to the
47 // bubble margin itself to equalize the margins at 13px.
48 const int kBubbleOuterMargin = 5;
49
50 // Spacing between major items should be 9px.
51 const int kItemMajorSpacing = 9;
52
53 // Button border size, draws inside the spacing distance.
54 const int kButtonBorderSize = 2;
55
56 } // namespace 53 } // namespace
57 54
58 scoped_ptr<BubbleUi> ChooserBubbleDelegate::BuildBubbleUi() { 55 scoped_ptr<BubbleUi> ChooserBubbleDelegate::BuildBubbleUi() {
59 return make_scoped_ptr(new ChooserBubbleUiView(browser_, this)); 56 return make_scoped_ptr(new ChooserBubbleUiView(browser_, this));
60 } 57 }
61 58
62 class ChooserTableModel; 59 class ChooserTableModel;
63 60
64 /////////////////////////////////////////////////////////////////////////////// 61 ///////////////////////////////////////////////////////////////////////////////
65 // View implementation for the chooser bubble. 62 // View implementation for the chooser bubble.
66 class ChooserBubbleUiViewDelegate : public views::BubbleDelegateView, 63 class ChooserBubbleUiViewDelegate : public views::BubbleDelegateView,
Evan Stade 2016/02/22 23:15:16 I find it very confusing how this is a BubbleDeleg
juncai 2016/02/23 01:34:21 Since the class name change will also touch the co
67 public views::ButtonListener, 64 public views::ButtonListener,
65 public views::StyledLabelListener,
68 public views::TableViewObserver { 66 public views::TableViewObserver {
69 public: 67 public:
70 ChooserBubbleUiViewDelegate(views::View* anchor_view, 68 ChooserBubbleUiViewDelegate(views::View* anchor_view,
71 views::BubbleBorder::Arrow anchor_arrow, 69 views::BubbleBorder::Arrow anchor_arrow,
72 ChooserBubbleUiView* owner, 70 ChooserBubbleUiView* owner,
73 ChooserBubbleDelegate* chooser_bubble_delegate); 71 ChooserBubbleDelegate* chooser_bubble_delegate);
74 ~ChooserBubbleUiViewDelegate() override; 72 ~ChooserBubbleUiViewDelegate() override;
75 73
76 void Close(); 74 void Close();
77 75
78 // BubbleDelegateView: 76 // views::BubbleDelegateView:
79 bool ShouldShowWindowTitle() const override; 77 bool ShouldShowWindowTitle() const override;
80 base::string16 GetWindowTitle() const override; 78 base::string16 GetWindowTitle() const override;
81 void OnWidgetDestroying(views::Widget* widget) override; 79 void OnWidgetDestroying(views::Widget* widget) override;
82 80
83 // ButtonListener: 81 // views::ButtonListener:
84 void ButtonPressed(views::Button* button, const ui::Event& event) override; 82 void ButtonPressed(views::Button* button, const ui::Event& event) override;
85 83
84 // views::StyledLabelListener:
85 void StyledLabelLinkClicked(views::StyledLabel* label,
86 const gfx::Range& range,
87 int event_flags) override;
88
86 // views::TableViewObserver: 89 // views::TableViewObserver:
87 void OnSelectionChanged() override; 90 void OnSelectionChanged() override;
88 91
89 // Updates the anchor's arrow and view. Also repositions the bubble so it's 92 // Updates the anchor's arrow and view. Also repositions the bubble so it's
90 // displayed in the correct location. 93 // displayed in the correct location.
91 void UpdateAnchor(views::View* anchor_view, 94 void UpdateAnchor(views::View* anchor_view,
92 views::BubbleBorder::Arrow anchor_arrow); 95 views::BubbleBorder::Arrow anchor_arrow);
93 96
94 private: 97 private:
95 friend ChooserBubbleUiView; 98 friend ChooserBubbleUiView;
96 99
97 ChooserBubbleUiView* owner_; 100 ChooserBubbleUiView* owner_;
98 ChooserBubbleDelegate* chooser_bubble_delegate_; 101 ChooserBubbleDelegate* chooser_bubble_delegate_;
99 102
100 views::LabelButton* connect_button_; 103 views::LabelButton* connect_button_;
101 views::LabelButton* cancel_button_;
102 views::TableView* table_view_; 104 views::TableView* table_view_;
103 ChooserTableModel* chooser_table_model_; 105 ChooserTableModel* chooser_table_model_;
104 bool button_pressed_; 106 bool button_pressed_;
105 107
106 DISALLOW_COPY_AND_ASSIGN(ChooserBubbleUiViewDelegate); 108 DISALLOW_COPY_AND_ASSIGN(ChooserBubbleUiViewDelegate);
107 }; 109 };
108 110
109 ui::TableColumn ChooserTableColumn(int id, const std::string& title) { 111 ui::TableColumn ChooserTableColumn(int id, const std::string& title) {
110 ui::TableColumn column; 112 ui::TableColumn column;
111 column.id = id; 113 column.id = id;
(...skipping 27 matching lines...) Expand all
139 141
140 ChooserBubbleUiViewDelegate::ChooserBubbleUiViewDelegate( 142 ChooserBubbleUiViewDelegate::ChooserBubbleUiViewDelegate(
141 views::View* anchor_view, 143 views::View* anchor_view,
142 views::BubbleBorder::Arrow anchor_arrow, 144 views::BubbleBorder::Arrow anchor_arrow,
143 ChooserBubbleUiView* owner, 145 ChooserBubbleUiView* owner,
144 ChooserBubbleDelegate* chooser_bubble_delegate) 146 ChooserBubbleDelegate* chooser_bubble_delegate)
145 : views::BubbleDelegateView(anchor_view, anchor_arrow), 147 : views::BubbleDelegateView(anchor_view, anchor_arrow),
146 owner_(owner), 148 owner_(owner),
147 chooser_bubble_delegate_(chooser_bubble_delegate), 149 chooser_bubble_delegate_(chooser_bubble_delegate),
148 button_pressed_(false) { 150 button_pressed_(false) {
151 // TODO(juncai): try using DialogClientView to build the chooser UI view since
152 // they look similar.
153 // https://crbug.com/587545
154 // ------------------------------------
155 // | Chooser bubble title |
156 // | -------------------------------- |
157 // | | option 0 | |
158 // | | option 1 | |
159 // | | option 2 | |
160 // | | | |
161 // | | | |
162 // | | | |
163 // | -------------------------------- |
164 // | [ Connect ] [ Cancel ] |
165 // |----------------------------------|
166 // | Not seeing your device? Get help |
167 // ------------------------------------
168
149 views::GridLayout* layout = new views::GridLayout(this); 169 views::GridLayout* layout = new views::GridLayout(this);
150 SetLayoutManager(layout); 170 SetLayoutManager(layout);
151 171
152 views::ColumnSet* column_set = layout->AddColumnSet(0); 172 views::ColumnSet* column_set = layout->AddColumnSet(0);
153 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, 173 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
154 views::GridLayout::USE_PREF, 0, 0); 174 views::GridLayout::USE_PREF, 0, 0);
155 175
156 layout->StartRow(1, 0); 176 // Lay out the table view.
157 177 layout->StartRow(0, 0);
158 // Create a table view
159 std::vector<ui::TableColumn> table_columns; 178 std::vector<ui::TableColumn> table_columns;
160 table_columns.push_back(ChooserTableColumn( 179 table_columns.push_back(ChooserTableColumn(
161 0, "" /* Empty string makes the column title invisible */)); 180 0, "" /* Empty string makes the column title invisible */));
162 chooser_table_model_ = new ChooserTableModel(chooser_bubble_delegate_); 181 chooser_table_model_ = new ChooserTableModel(chooser_bubble_delegate_);
163 table_view_ = new views::TableView(chooser_table_model_, table_columns, 182 table_view_ = new views::TableView(chooser_table_model_, table_columns,
164 views::TEXT_ONLY, true); 183 views::TEXT_ONLY, true);
165 table_view_->set_select_on_remove(false); 184 table_view_->set_select_on_remove(false);
166 chooser_table_model_->SetObserver(table_view_); 185 chooser_table_model_->SetObserver(table_view_);
167 table_view_->SetObserver(this); 186 table_view_->SetObserver(this);
187 if (chooser_bubble_delegate_->NumOptions() == 0)
188 table_view_->SetEnabled(false);
Evan Stade 2016/02/22 23:15:16 nit: table_view_->SetEnabled(chooser_bubble_deleg
juncai 2016/02/23 01:34:21 Done.
168 layout->AddView(table_view_->CreateParentIfNecessary(), 1, 1, 189 layout->AddView(table_view_->CreateParentIfNecessary(), 1, 1,
169 views::GridLayout::FILL, views::GridLayout::FILL, 190 views::GridLayout::FILL, views::GridLayout::FILL,
170 kChooserPermissionBubbleWidth, 191 kChooserPermissionBubbleWidth,
171 kChooserPermissionBubbleHeight); 192 kChooserPermissionBubbleHeight);
172 if (chooser_bubble_delegate_->NumOptions() == 0) {
173 table_view_->SetEnabled(false);
174 }
175 193
176 layout->AddPaddingRow(0, kItemMajorSpacing); 194 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
177
178 views::View* button_row = new views::View();
179 views::GridLayout* button_layout = new views::GridLayout(button_row);
180 views::ColumnSet* button_columns = button_layout->AddColumnSet(0);
181 button_row->SetLayoutManager(button_layout);
182 layout->StartRow(1, 0);
183 layout->AddView(button_row);
184 195
185 // Lay out the Connect/Cancel buttons. 196 // Lay out the Connect/Cancel buttons.
186 button_columns->AddColumn(views::GridLayout::TRAILING, 197 layout->StartRow(0, 0);
187 views::GridLayout::FILL, 100, 198 views::View* button_row = new views::View();
188 views::GridLayout::USE_PREF, 0, 0); 199 views::BoxLayout* button_layout = new views::BoxLayout(
189 button_columns->AddPaddingColumn(0, 200 views::BoxLayout::kHorizontal, 0, 0, views::kRelatedButtonHSpacing);
190 kItemMajorSpacing - (2 * kButtonBorderSize)); 201 button_layout->set_main_axis_alignment(
191 button_columns->AddColumn(views::GridLayout::TRAILING, 202 views::BoxLayout::MAIN_AXIS_ALIGNMENT_END);
192 views::GridLayout::FILL, 0, 203 button_row->SetLayoutManager(button_layout);
193 views::GridLayout::USE_PREF, 0, 0);
194 button_layout->StartRow(0, 0);
195 204
196 base::string16 connect_text = 205 base::string16 connect_text =
197 l10n_util::GetStringUTF16(IDS_CHOOSER_BUBBLE_CONNECT_BUTTON_TEXT); 206 l10n_util::GetStringUTF16(IDS_CHOOSER_BUBBLE_CONNECT_BUTTON_TEXT);
198 connect_button_ = new views::LabelButton(this, connect_text); 207 connect_button_ = new views::LabelButton(this, connect_text);
199 connect_button_->SetStyle(views::Button::STYLE_BUTTON); 208 connect_button_->SetStyle(views::Button::STYLE_BUTTON);
200 // Disable the connect button at the beginning since no device selected yet. 209 // Disable the connect button at the beginning since no device selected yet.
201 connect_button_->SetEnabled(false); 210 connect_button_->SetEnabled(false);
202 button_layout->AddView(connect_button_); 211 button_row->AddChildView(connect_button_);
203 chooser_table_model_->SetConnectButton(connect_button_); 212 chooser_table_model_->SetConnectButton(connect_button_);
204 213
205 base::string16 cancel_text = 214 base::string16 cancel_text =
206 l10n_util::GetStringUTF16(IDS_CHOOSER_BUBBLE_CANCEL_BUTTON_TEXT); 215 l10n_util::GetStringUTF16(IDS_CHOOSER_BUBBLE_CANCEL_BUTTON_TEXT);
207 cancel_button_ = new views::LabelButton(this, cancel_text); 216 views::LabelButton* cancel_button = new views::LabelButton(this, cancel_text);
208 cancel_button_->SetStyle(views::Button::STYLE_BUTTON); 217 cancel_button->SetStyle(views::Button::STYLE_BUTTON);
209 button_layout->AddView(cancel_button_); 218 button_row->AddChildView(cancel_button);
219 layout->AddView(button_row);
210 220
211 button_layout->AddPaddingRow(0, kBubbleOuterMargin); 221 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
222
223 // Lay out the separator.
224 layout->StartRow(0, 0);
225 layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
226
227 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
228
229 // Lay out the styled label.
230 layout->StartRow(0, 0);
231 base::string16 link =
232 l10n_util::GetStringUTF16(IDS_CHOOSER_BUBBLE_GET_HELP_LINK_TEXT);
233 size_t offset;
234 base::string16 text = l10n_util::GetStringFUTF16(
235 IDS_CHOOSER_BUBBLE_FOOTNOTE_TEXT, link, &offset);
236 views::StyledLabel* label = new views::StyledLabel(text, this);
237 label->AddStyleRange(gfx::Range(offset, offset + link.length()),
238 views::StyledLabel::RangeStyleInfo::CreateForLink());
239 layout->AddView(label);
212 } 240 }
213 241
214 ChooserBubbleUiViewDelegate::~ChooserBubbleUiViewDelegate() { 242 ChooserBubbleUiViewDelegate::~ChooserBubbleUiViewDelegate() {
215 RemoveAllChildViews(true); 243 RemoveAllChildViews(true);
216 if (owner_) 244 if (owner_)
217 owner_->Close(); 245 owner_->Close();
218 chooser_table_model_->SetObserver(nullptr); 246 chooser_table_model_->SetObserver(nullptr);
219 } 247 }
220 248
221 void ChooserBubbleUiViewDelegate::Close() { 249 void ChooserBubbleUiViewDelegate::Close() {
(...skipping 27 matching lines...) Expand all
249 chooser_bubble_delegate_->Select(table_view_->selection_model().active()); 277 chooser_bubble_delegate_->Select(table_view_->selection_model().active());
250 else 278 else
251 chooser_bubble_delegate_->Cancel(); 279 chooser_bubble_delegate_->Cancel();
252 280
253 if (owner_) { 281 if (owner_) {
254 owner_->Close(); 282 owner_->Close();
255 owner_ = nullptr; 283 owner_ = nullptr;
256 } 284 }
257 } 285 }
258 286
287 void ChooserBubbleUiViewDelegate::StyledLabelLinkClicked(
288 views::StyledLabel* label,
289 const gfx::Range& range,
290 int event_flags) {
291 chooser_bubble_delegate_->OpenHelpCenterUrl();
292 }
293
259 void ChooserBubbleUiViewDelegate::OnSelectionChanged() { 294 void ChooserBubbleUiViewDelegate::OnSelectionChanged() {
260 connect_button_->SetEnabled(!table_view_->selection_model().empty()); 295 connect_button_->SetEnabled(!table_view_->selection_model().empty());
261 } 296 }
262 297
263 void ChooserBubbleUiViewDelegate::UpdateAnchor( 298 void ChooserBubbleUiViewDelegate::UpdateAnchor(
264 views::View* anchor_view, 299 views::View* anchor_view,
265 views::BubbleBorder::Arrow anchor_arrow) { 300 views::BubbleBorder::Arrow anchor_arrow) {
266 if (GetAnchorView() == anchor_view && arrow() == anchor_arrow) 301 if (GetAnchorView() == anchor_view && arrow() == anchor_arrow)
267 return; 302 return;
268 303
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 return browser_view->exclusive_access_bubble()->GetView(); 435 return browser_view->exclusive_access_bubble()->GetView();
401 436
402 return browser_view->top_container(); 437 return browser_view->top_container();
403 } 438 }
404 439
405 views::BubbleBorder::Arrow ChooserBubbleUiView::GetAnchorArrow() { 440 views::BubbleBorder::Arrow ChooserBubbleUiView::GetAnchorArrow() {
406 if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)) 441 if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR))
407 return views::BubbleBorder::TOP_LEFT; 442 return views::BubbleBorder::TOP_LEFT;
408 return views::BubbleBorder::NONE; 443 return views::BubbleBorder::NONE;
409 } 444 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698