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

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

Issue 2344133003: Add help link when Bluetooth adapter is off for WebBluetooth chooser (Closed)
Patch Set: address more comments Created 4 years, 2 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/chooser_content_view.h" 5 #include "chrome/browser/ui/views/chooser_content_view.h"
6 6
7 #include "base/numerics/safe_conversions.h" 7 #include "base/numerics/safe_conversions.h"
8 #include "chrome/grit/generated_resources.h" 8 #include "chrome/grit/generated_resources.h"
9 #include "ui/base/l10n/l10n_util.h" 9 #include "ui/base/l10n/l10n_util.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
11 #include "ui/gfx/color_palette.h" 11 #include "ui/gfx/color_palette.h"
12 #include "ui/gfx/geometry/point.h"
13 #include "ui/gfx/geometry/rect.h"
12 #include "ui/gfx/image/image_skia.h" 14 #include "ui/gfx/image/image_skia.h"
13 #include "ui/gfx/paint_vector_icon.h" 15 #include "ui/gfx/paint_vector_icon.h"
14 #include "ui/gfx/vector_icons_public.h" 16 #include "ui/gfx/vector_icons_public.h"
15 #include "ui/resources/grit/ui_resources.h" 17 #include "ui/resources/grit/ui_resources.h"
16 #include "ui/views/controls/link.h" 18 #include "ui/views/controls/link.h"
17 #include "ui/views/controls/styled_label.h" 19 #include "ui/views/controls/styled_label.h"
18 #include "ui/views/controls/table/table_view.h" 20 #include "ui/views/controls/table/table_view.h"
19 #include "ui/views/controls/throbber.h" 21 #include "ui/views/controls/throbber.h"
20 #include "ui/views/layout/fill_layout.h"
21 22
22 namespace { 23 namespace {
23 24
24 const int kChooserWidth = 330; 25 const int kChooserWidth = 330;
25 26
26 const int kChooserHeight = 220; 27 const int kChooserHeight = 220;
27 28
28 const int kThrobberDiameter = 24; 29 const int kThrobberDiameter = 24;
29 30
31 const int kAdapterOffHelpLinkPadding = 5;
32
30 // The lookup table for signal strength level image. 33 // The lookup table for signal strength level image.
31 const int kSignalStrengthLevelImageIds[5] = {IDR_SIGNAL_0_BAR, IDR_SIGNAL_1_BAR, 34 const int kSignalStrengthLevelImageIds[5] = {IDR_SIGNAL_0_BAR, IDR_SIGNAL_1_BAR,
32 IDR_SIGNAL_2_BAR, IDR_SIGNAL_3_BAR, 35 IDR_SIGNAL_2_BAR, IDR_SIGNAL_3_BAR,
33 IDR_SIGNAL_4_BAR}; 36 IDR_SIGNAL_4_BAR};
34 37
35 } // namespace 38 } // namespace
36 39
37 ChooserContentView::ChooserContentView( 40 ChooserContentView::ChooserContentView(
38 views::TableViewObserver* table_view_observer, 41 views::TableViewObserver* table_view_observer,
39 std::unique_ptr<ChooserController> chooser_controller) 42 std::unique_ptr<ChooserController> chooser_controller)
40 : chooser_controller_(std::move(chooser_controller)) { 43 : chooser_controller_(std::move(chooser_controller)) {
41 chooser_controller_->set_view(this); 44 chooser_controller_->set_view(this);
42 std::vector<ui::TableColumn> table_columns; 45 std::vector<ui::TableColumn> table_columns;
43 table_columns.push_back(ui::TableColumn()); 46 table_columns.push_back(ui::TableColumn());
44 table_view_ = new views::TableView( 47 table_view_ = new views::TableView(
45 this, table_columns, 48 this, table_columns,
46 chooser_controller_->ShouldShowIconBeforeText() ? views::ICON_AND_TEXT 49 chooser_controller_->ShouldShowIconBeforeText() ? views::ICON_AND_TEXT
47 : views::TEXT_ONLY, 50 : views::TEXT_ONLY,
48 true /* single_selection */); 51 true /* single_selection */);
49 table_view_->set_select_on_remove(false); 52 table_view_->set_select_on_remove(false);
50 table_view_->SetObserver(table_view_observer); 53 table_view_->SetObserver(table_view_observer);
51 table_view_->SetEnabled(chooser_controller_->NumOptions() > 0); 54 table_view_->SetEnabled(chooser_controller_->NumOptions() > 0);
52 55
53 SetLayoutManager(new views::FillLayout()); 56 table_parent_ = table_view_->CreateParentIfNecessary();
54 views::View* table_parent = table_view_->CreateParentIfNecessary(); 57 AddChildView(table_parent_);
55 AddChildView(table_parent);
56 58
57 throbber_ = new views::Throbber(); 59 throbber_ = new views::Throbber();
58 // Set the throbber in the center of the chooser.
59 throbber_->SetBounds((kChooserWidth - kThrobberDiameter) / 2,
60 (kChooserHeight - kThrobberDiameter) / 2,
61 kThrobberDiameter, kThrobberDiameter);
62 throbber_->SetVisible(false); 60 throbber_->SetVisible(false);
63 AddChildView(throbber_); 61 AddChildView(throbber_);
62
63 turn_adapter_off_help_ = new views::Link(
64 l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_TURN_ADAPTER_OFF));
65 turn_adapter_off_help_->SetHandlesTooltips(false);
66 turn_adapter_off_help_->SetUnderline(false);
67 turn_adapter_off_help_->SetMultiLine(true);
68 turn_adapter_off_help_->SizeToFit(kChooserWidth);
69 turn_adapter_off_help_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
70 turn_adapter_off_help_->set_listener(this);
71 turn_adapter_off_help_->SetVisible(false);
72 AddChildView(turn_adapter_off_help_);
64 } 73 }
65 74
66 ChooserContentView::~ChooserContentView() { 75 ChooserContentView::~ChooserContentView() {
67 chooser_controller_->set_view(nullptr); 76 chooser_controller_->set_view(nullptr);
68 table_view_->SetObserver(nullptr); 77 table_view_->SetObserver(nullptr);
69 table_view_->SetModel(nullptr); 78 table_view_->SetModel(nullptr);
79 turn_adapter_off_help_->set_listener(nullptr);
70 if (discovery_state_) 80 if (discovery_state_)
71 discovery_state_->set_listener(nullptr); 81 discovery_state_->set_listener(nullptr);
72 } 82 }
73 83
74 gfx::Size ChooserContentView::GetPreferredSize() const { 84 gfx::Size ChooserContentView::GetPreferredSize() const {
75 return gfx::Size(kChooserWidth, kChooserHeight); 85 return gfx::Size(kChooserWidth, kChooserHeight);
76 } 86 }
77 87
88 void ChooserContentView::Layout() {
Jeffrey Yasskin 2016/09/28 23:12:23 This is great, thanks!
89 gfx::Rect rect(GetContentsBounds());
90 table_parent_->SetBoundsRect(rect);
91 // Set the throbber in the center of the chooser.
92 throbber_->SetBounds((rect.width() - kThrobberDiameter) / 2,
93 (rect.height() - kThrobberDiameter) / 2,
94 kThrobberDiameter, kThrobberDiameter);
95 turn_adapter_off_help_->SetPosition(
96 gfx::Point(kAdapterOffHelpLinkPadding, kAdapterOffHelpLinkPadding));
sky 2016/09/29 03:32:31 It's certainly ok to roll your own layout like thi
juncai 2016/09/29 21:14:57 Done.
97 }
98
78 int ChooserContentView::RowCount() { 99 int ChooserContentView::RowCount() {
79 // When there are no devices, the table contains a message saying there 100 // When there are no devices, the table contains a message saying there
80 // are no devices, so the number of rows is always at least 1. 101 // are no devices, so the number of rows is always at least 1.
81 return std::max(base::checked_cast<int>(chooser_controller_->NumOptions()), 102 return std::max(base::checked_cast<int>(chooser_controller_->NumOptions()),
82 1); 103 1);
83 } 104 }
84 105
85 base::string16 ChooserContentView::GetText(int row, int column_id) { 106 base::string16 ChooserContentView::GetText(int row, int column_id) {
86 int num_options = base::checked_cast<int>(chooser_controller_->NumOptions()); 107 int num_options = base::checked_cast<int>(chooser_controller_->NumOptions());
87 if (num_options == 0) { 108 if (num_options == 0) {
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 table_view_->OnItemsChanged(base::checked_cast<int>(index), 1); 173 table_view_->OnItemsChanged(base::checked_cast<int>(index), 1);
153 UpdateTableView(); 174 UpdateTableView();
154 } 175 }
155 176
156 void ChooserContentView::OnAdapterEnabledChanged(bool enabled) { 177 void ChooserContentView::OnAdapterEnabledChanged(bool enabled) {
157 // No row is selected since the adapter status has changed. 178 // No row is selected since the adapter status has changed.
158 // This will also disable the OK button if it was enabled because 179 // This will also disable the OK button if it was enabled because
159 // of a previously selected row. 180 // of a previously selected row.
160 table_view_->Select(-1); 181 table_view_->Select(-1);
161 UpdateTableView(); 182 UpdateTableView();
162 table_view_->SetVisible(true); 183 table_view_->SetVisible(enabled);
184 turn_adapter_off_help_->SetVisible(!enabled);
163 185
164 throbber_->Stop(); 186 throbber_->Stop();
165 throbber_->SetVisible(false); 187 throbber_->SetVisible(false);
166 188
167 discovery_state_->SetText(chooser_controller_->GetStatus()); 189 discovery_state_->SetText(chooser_controller_->GetStatus());
168 discovery_state_->SetEnabled(enabled); 190 discovery_state_->SetEnabled(enabled);
169 } 191 }
170 192
171 void ChooserContentView::OnRefreshStateChanged(bool refreshing) { 193 void ChooserContentView::OnRefreshStateChanged(bool refreshing) {
172 if (refreshing) { 194 if (refreshing) {
(...skipping 15 matching lines...) Expand all
188 else 210 else
189 throbber_->Stop(); 211 throbber_->Stop();
190 212
191 discovery_state_->SetText(chooser_controller_->GetStatus()); 213 discovery_state_->SetText(chooser_controller_->GetStatus());
192 // When refreshing, disable |discovery_state_| to show it as a text label. 214 // When refreshing, disable |discovery_state_| to show it as a text label.
193 // When complete, enable |discovery_state_| to show it as a link. 215 // When complete, enable |discovery_state_| to show it as a link.
194 discovery_state_->SetEnabled(!refreshing); 216 discovery_state_->SetEnabled(!refreshing);
195 } 217 }
196 218
197 void ChooserContentView::LinkClicked(views::Link* source, int event_flags) { 219 void ChooserContentView::LinkClicked(views::Link* source, int event_flags) {
198 chooser_controller_->RefreshOptions(); 220 if (source == discovery_state_)
221 chooser_controller_->RefreshOptions();
222 else if (source == turn_adapter_off_help_)
223 chooser_controller_->OpenAdapterOffHelpUrl();
224 else
225 NOTREACHED();
199 } 226 }
200 227
201 void ChooserContentView::StyledLabelLinkClicked(views::StyledLabel* label, 228 void ChooserContentView::StyledLabelLinkClicked(views::StyledLabel* label,
202 const gfx::Range& range, 229 const gfx::Range& range,
203 int event_flags) { 230 int event_flags) {
204 chooser_controller_->OpenHelpCenterUrl(); 231 chooser_controller_->OpenHelpCenterUrl();
205 } 232 }
206 233
207 base::string16 ChooserContentView::GetWindowTitle() const { 234 base::string16 ChooserContentView::GetWindowTitle() const {
208 return chooser_controller_->GetTitle(); 235 return chooser_controller_->GetTitle();
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 } 284 }
258 285
259 void ChooserContentView::UpdateTableView() { 286 void ChooserContentView::UpdateTableView() {
260 if (chooser_controller_->NumOptions() == 0) { 287 if (chooser_controller_->NumOptions() == 0) {
261 table_view_->OnModelChanged(); 288 table_view_->OnModelChanged();
262 table_view_->SetEnabled(false); 289 table_view_->SetEnabled(false);
263 } else { 290 } else {
264 table_view_->SetEnabled(true); 291 table_view_->SetEnabled(true);
265 } 292 }
266 } 293 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698