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

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: rebase Created 4 years, 3 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"
12 #include "ui/gfx/image/image_skia.h" 13 #include "ui/gfx/image/image_skia.h"
13 #include "ui/gfx/paint_vector_icon.h" 14 #include "ui/gfx/paint_vector_icon.h"
14 #include "ui/gfx/vector_icons_public.h" 15 #include "ui/gfx/vector_icons_public.h"
15 #include "ui/resources/grit/ui_resources.h" 16 #include "ui/resources/grit/ui_resources.h"
16 #include "ui/views/controls/link.h" 17 #include "ui/views/controls/link.h"
17 #include "ui/views/controls/styled_label.h" 18 #include "ui/views/controls/styled_label.h"
18 #include "ui/views/controls/table/table_view.h" 19 #include "ui/views/controls/table/table_view.h"
19 #include "ui/views/controls/throbber.h" 20 #include "ui/views/controls/throbber.h"
20 #include "ui/views/layout/fill_layout.h" 21 #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)
(...skipping 14 matching lines...) Expand all
54 views::View* table_parent = table_view_->CreateParentIfNecessary(); 57 views::View* table_parent = table_view_->CreateParentIfNecessary();
55 AddChildView(table_parent); 58 AddChildView(table_parent);
56 59
57 throbber_ = new views::Throbber(); 60 throbber_ = new views::Throbber();
58 // Set the throbber in the center of the chooser. 61 // Set the throbber in the center of the chooser.
59 throbber_->SetBounds((kChooserWidth - kThrobberDiameter) / 2, 62 throbber_->SetBounds((kChooserWidth - kThrobberDiameter) / 2,
60 (kChooserHeight - kThrobberDiameter) / 2, 63 (kChooserHeight - kThrobberDiameter) / 2,
61 kThrobberDiameter, kThrobberDiameter); 64 kThrobberDiameter, kThrobberDiameter);
62 throbber_->SetVisible(false); 65 throbber_->SetVisible(false);
63 AddChildView(throbber_); 66 AddChildView(throbber_);
67
68 adapter_off_help_ = new views::Link(
69 l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_ADAPTER_OFF));
sky 2016/09/18 16:06:27 TURN_ADAPTER_OFF/
juncai 2016/09/19 19:55:24 Done.
70 adapter_off_help_->SetHandlesTooltips(false);
71 adapter_off_help_->SetUnderline(false);
72 adapter_off_help_->SetMultiLine(true);
73 adapter_off_help_->SizeToFit(kChooserWidth);
74 adapter_off_help_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
75 adapter_off_help_->set_listener(this);
76 adapter_off_help_->SetPosition(
sky 2016/09/18 16:06:27 Why are you setting the position here? You have a
juncai 2016/09/19 19:55:24 Done.
77 gfx::Point(kAdapterOffHelpLinkPadding, kAdapterOffHelpLinkPadding));
78 adapter_off_help_->SetVisible(false);
79 AddChildView(adapter_off_help_);
64 } 80 }
65 81
66 ChooserContentView::~ChooserContentView() { 82 ChooserContentView::~ChooserContentView() {
67 chooser_controller_->set_view(nullptr); 83 chooser_controller_->set_view(nullptr);
68 table_view_->SetObserver(nullptr); 84 table_view_->SetObserver(nullptr);
69 table_view_->SetModel(nullptr); 85 table_view_->SetModel(nullptr);
86 adapter_off_help_->set_listener(nullptr);
70 if (discovery_state_) 87 if (discovery_state_)
71 discovery_state_->set_listener(nullptr); 88 discovery_state_->set_listener(nullptr);
72 } 89 }
73 90
74 gfx::Size ChooserContentView::GetPreferredSize() const { 91 gfx::Size ChooserContentView::GetPreferredSize() const {
75 return gfx::Size(kChooserWidth, kChooserHeight); 92 return gfx::Size(kChooserWidth, kChooserHeight);
76 } 93 }
77 94
78 int ChooserContentView::RowCount() { 95 int ChooserContentView::RowCount() {
79 // When there are no devices, the table contains a message saying there 96 // When there are no devices, the table contains a message saying there
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 table_view_->OnItemsChanged(base::checked_cast<int>(index), 1); 169 table_view_->OnItemsChanged(base::checked_cast<int>(index), 1);
153 UpdateTableView(); 170 UpdateTableView();
154 } 171 }
155 172
156 void ChooserContentView::OnAdapterEnabledChanged(bool enabled) { 173 void ChooserContentView::OnAdapterEnabledChanged(bool enabled) {
157 // No row is selected since the adapter status has changed. 174 // No row is selected since the adapter status has changed.
158 // This will also disable the OK button if it was enabled because 175 // This will also disable the OK button if it was enabled because
159 // of a previously selected row. 176 // of a previously selected row.
160 table_view_->Select(-1); 177 table_view_->Select(-1);
161 UpdateTableView(); 178 UpdateTableView();
162 table_view_->SetVisible(true); 179 table_view_->SetVisible(enabled);
180 adapter_off_help_->SetVisible(!enabled);
163 181
164 throbber_->Stop(); 182 throbber_->Stop();
165 throbber_->SetVisible(false); 183 throbber_->SetVisible(false);
166 184
167 discovery_state_->SetText(chooser_controller_->GetStatus()); 185 discovery_state_->SetText(chooser_controller_->GetStatus());
168 discovery_state_->SetEnabled(enabled); 186 discovery_state_->SetEnabled(enabled);
169 } 187 }
170 188
171 void ChooserContentView::OnRefreshStateChanged(bool refreshing) { 189 void ChooserContentView::OnRefreshStateChanged(bool refreshing) {
172 if (refreshing) { 190 if (refreshing) {
(...skipping 15 matching lines...) Expand all
188 else 206 else
189 throbber_->Stop(); 207 throbber_->Stop();
190 208
191 discovery_state_->SetText(chooser_controller_->GetStatus()); 209 discovery_state_->SetText(chooser_controller_->GetStatus());
192 // When refreshing, disable |discovery_state_| to show it as a text label. 210 // When refreshing, disable |discovery_state_| to show it as a text label.
193 // When complete, enable |discovery_state_| to show it as a link. 211 // When complete, enable |discovery_state_| to show it as a link.
194 discovery_state_->SetEnabled(!refreshing); 212 discovery_state_->SetEnabled(!refreshing);
195 } 213 }
196 214
197 void ChooserContentView::LinkClicked(views::Link* source, int event_flags) { 215 void ChooserContentView::LinkClicked(views::Link* source, int event_flags) {
198 chooser_controller_->RefreshOptions(); 216 if (source == discovery_state_)
217 chooser_controller_->RefreshOptions();
218 else if (source == adapter_off_help_)
219 chooser_controller_->OpenAdapterOffHelpUrl();
220 else
221 NOTREACHED();
199 } 222 }
200 223
201 void ChooserContentView::StyledLabelLinkClicked(views::StyledLabel* label, 224 void ChooserContentView::StyledLabelLinkClicked(views::StyledLabel* label,
202 const gfx::Range& range, 225 const gfx::Range& range,
203 int event_flags) { 226 int event_flags) {
204 chooser_controller_->OpenHelpCenterUrl(); 227 chooser_controller_->OpenHelpCenterUrl();
205 } 228 }
206 229
207 base::string16 ChooserContentView::GetWindowTitle() const { 230 base::string16 ChooserContentView::GetWindowTitle() const {
208 return chooser_controller_->GetTitle(); 231 return chooser_controller_->GetTitle();
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 } 280 }
258 281
259 void ChooserContentView::UpdateTableView() { 282 void ChooserContentView::UpdateTableView() {
260 if (chooser_controller_->NumOptions() == 0) { 283 if (chooser_controller_->NumOptions() == 0) {
261 table_view_->OnModelChanged(); 284 table_view_->OnModelChanged();
262 table_view_->SetEnabled(false); 285 table_view_->SetEnabled(false);
263 } else { 286 } else {
264 table_view_->SetEnabled(true); 287 table_view_->SetEnabled(true);
265 } 288 }
266 } 289 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698