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

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: updated the kBluetoothAdapterOffHelpURL 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/layout_manager.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
38 class ChooserContentViewLayoutManager : public views::LayoutManager {
39 public:
40 ChooserContentViewLayoutManager(views::View* table_parent,
41 views::View* throbber,
42 views::View* turn_adapter_off_help)
43 : table_parent_(table_parent),
44 throbber_(throbber),
45 turn_adapter_off_help_(turn_adapter_off_help) {}
46
47 ~ChooserContentViewLayoutManager() override {}
48
49 // views::LayoutManager:
50 void Layout(views::View* host) override {
51 table_parent_->SetBoundsRect(host->GetContentsBounds());
52 // Set the throbber in the center of the chooser.
53 throbber_->SetBounds((kChooserWidth - kThrobberDiameter) / 2,
Jeffrey Yasskin 2016/09/26 23:25:07 Do we need to deal with not getting our preferred
juncai 2016/09/28 22:45:42 Done.
54 (kChooserHeight - kThrobberDiameter) / 2,
55 kThrobberDiameter, kThrobberDiameter);
56 turn_adapter_off_help_->SetPosition(
57 gfx::Point(kAdapterOffHelpLinkPadding, kAdapterOffHelpLinkPadding));
58 }
59
60 // views::LayoutManager:
61 gfx::Size GetPreferredSize(const views::View* host) const override {
62 return gfx::Size(kChooserWidth, kChooserHeight);
63 }
64
65 private:
66 views::View* table_parent_;
67 views::View* throbber_;
68 views::View* turn_adapter_off_help_;
69
70 DISALLOW_COPY_AND_ASSIGN(ChooserContentViewLayoutManager);
71 };
72
35 } // namespace 73 } // namespace
36 74
37 ChooserContentView::ChooserContentView( 75 ChooserContentView::ChooserContentView(
38 views::TableViewObserver* table_view_observer, 76 views::TableViewObserver* table_view_observer,
39 std::unique_ptr<ChooserController> chooser_controller) 77 std::unique_ptr<ChooserController> chooser_controller)
40 : chooser_controller_(std::move(chooser_controller)) { 78 : chooser_controller_(std::move(chooser_controller)) {
41 chooser_controller_->set_view(this); 79 chooser_controller_->set_view(this);
42 std::vector<ui::TableColumn> table_columns; 80 std::vector<ui::TableColumn> table_columns;
43 table_columns.push_back(ui::TableColumn()); 81 table_columns.push_back(ui::TableColumn());
44 table_view_ = new views::TableView( 82 table_view_ = new views::TableView(
45 this, table_columns, 83 this, table_columns,
46 chooser_controller_->ShouldShowIconBeforeText() ? views::ICON_AND_TEXT 84 chooser_controller_->ShouldShowIconBeforeText() ? views::ICON_AND_TEXT
47 : views::TEXT_ONLY, 85 : views::TEXT_ONLY,
48 true /* single_selection */); 86 true /* single_selection */);
49 table_view_->set_select_on_remove(false); 87 table_view_->set_select_on_remove(false);
50 table_view_->SetObserver(table_view_observer); 88 table_view_->SetObserver(table_view_observer);
51 table_view_->SetEnabled(chooser_controller_->NumOptions() > 0); 89 table_view_->SetEnabled(chooser_controller_->NumOptions() > 0);
52 90
53 SetLayoutManager(new views::FillLayout());
54 views::View* table_parent = table_view_->CreateParentIfNecessary(); 91 views::View* table_parent = table_view_->CreateParentIfNecessary();
55 AddChildView(table_parent); 92 AddChildView(table_parent);
56 93
57 throbber_ = new views::Throbber(); 94 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); 95 throbber_->SetVisible(false);
63 AddChildView(throbber_); 96 AddChildView(throbber_);
97
98 turn_adapter_off_help_ = new views::Link(
99 l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_TURN_ADAPTER_OFF));
100 turn_adapter_off_help_->SetHandlesTooltips(false);
101 turn_adapter_off_help_->SetUnderline(false);
102 turn_adapter_off_help_->SetMultiLine(true);
103 turn_adapter_off_help_->SizeToFit(kChooserWidth);
104 turn_adapter_off_help_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
105 turn_adapter_off_help_->set_listener(this);
106 turn_adapter_off_help_->SetVisible(false);
107 AddChildView(turn_adapter_off_help_);
108
109 SetLayoutManager(new ChooserContentViewLayoutManager(table_parent, throbber_,
Jeffrey Yasskin 2016/09/26 23:25:07 It looked to me like sky@ was suggesting to overri
juncai 2016/09/28 22:45:42 ah, I think I misunderstood the comment. Done.
110 turn_adapter_off_help_));
64 } 111 }
65 112
66 ChooserContentView::~ChooserContentView() { 113 ChooserContentView::~ChooserContentView() {
67 chooser_controller_->set_view(nullptr); 114 chooser_controller_->set_view(nullptr);
68 table_view_->SetObserver(nullptr); 115 table_view_->SetObserver(nullptr);
69 table_view_->SetModel(nullptr); 116 table_view_->SetModel(nullptr);
117 turn_adapter_off_help_->set_listener(nullptr);
70 if (discovery_state_) 118 if (discovery_state_)
71 discovery_state_->set_listener(nullptr); 119 discovery_state_->set_listener(nullptr);
72 } 120 }
73 121
74 gfx::Size ChooserContentView::GetPreferredSize() const { 122 gfx::Size ChooserContentView::GetPreferredSize() const {
75 return gfx::Size(kChooserWidth, kChooserHeight); 123 return gfx::Size(kChooserWidth, kChooserHeight);
76 } 124 }
77 125
78 int ChooserContentView::RowCount() { 126 int ChooserContentView::RowCount() {
79 // When there are no devices, the table contains a message saying there 127 // 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); 200 table_view_->OnItemsChanged(base::checked_cast<int>(index), 1);
153 UpdateTableView(); 201 UpdateTableView();
154 } 202 }
155 203
156 void ChooserContentView::OnAdapterEnabledChanged(bool enabled) { 204 void ChooserContentView::OnAdapterEnabledChanged(bool enabled) {
157 // No row is selected since the adapter status has changed. 205 // No row is selected since the adapter status has changed.
158 // This will also disable the OK button if it was enabled because 206 // This will also disable the OK button if it was enabled because
159 // of a previously selected row. 207 // of a previously selected row.
160 table_view_->Select(-1); 208 table_view_->Select(-1);
161 UpdateTableView(); 209 UpdateTableView();
162 table_view_->SetVisible(true); 210 table_view_->SetVisible(enabled);
211 turn_adapter_off_help_->SetVisible(!enabled);
163 212
164 throbber_->Stop(); 213 throbber_->Stop();
165 throbber_->SetVisible(false); 214 throbber_->SetVisible(false);
166 215
167 discovery_state_->SetText(chooser_controller_->GetStatus()); 216 discovery_state_->SetText(chooser_controller_->GetStatus());
168 discovery_state_->SetEnabled(enabled); 217 discovery_state_->SetEnabled(enabled);
169 } 218 }
170 219
171 void ChooserContentView::OnRefreshStateChanged(bool refreshing) { 220 void ChooserContentView::OnRefreshStateChanged(bool refreshing) {
172 if (refreshing) { 221 if (refreshing) {
(...skipping 15 matching lines...) Expand all
188 else 237 else
189 throbber_->Stop(); 238 throbber_->Stop();
190 239
191 discovery_state_->SetText(chooser_controller_->GetStatus()); 240 discovery_state_->SetText(chooser_controller_->GetStatus());
192 // When refreshing, disable |discovery_state_| to show it as a text label. 241 // When refreshing, disable |discovery_state_| to show it as a text label.
193 // When complete, enable |discovery_state_| to show it as a link. 242 // When complete, enable |discovery_state_| to show it as a link.
194 discovery_state_->SetEnabled(!refreshing); 243 discovery_state_->SetEnabled(!refreshing);
195 } 244 }
196 245
197 void ChooserContentView::LinkClicked(views::Link* source, int event_flags) { 246 void ChooserContentView::LinkClicked(views::Link* source, int event_flags) {
198 chooser_controller_->RefreshOptions(); 247 if (source == discovery_state_)
248 chooser_controller_->RefreshOptions();
249 else if (source == turn_adapter_off_help_)
250 chooser_controller_->OpenAdapterOffHelpUrl();
251 else
252 NOTREACHED();
199 } 253 }
200 254
201 void ChooserContentView::StyledLabelLinkClicked(views::StyledLabel* label, 255 void ChooserContentView::StyledLabelLinkClicked(views::StyledLabel* label,
202 const gfx::Range& range, 256 const gfx::Range& range,
203 int event_flags) { 257 int event_flags) {
204 chooser_controller_->OpenHelpCenterUrl(); 258 chooser_controller_->OpenHelpCenterUrl();
205 } 259 }
206 260
207 base::string16 ChooserContentView::GetWindowTitle() const { 261 base::string16 ChooserContentView::GetWindowTitle() const {
208 return chooser_controller_->GetTitle(); 262 return chooser_controller_->GetTitle();
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 } 311 }
258 312
259 void ChooserContentView::UpdateTableView() { 313 void ChooserContentView::UpdateTableView() {
260 if (chooser_controller_->NumOptions() == 0) { 314 if (chooser_controller_->NumOptions() == 0) {
261 table_view_->OnModelChanged(); 315 table_view_->OnModelChanged();
262 table_view_->SetEnabled(false); 316 table_view_->SetEnabled(false);
263 } else { 317 } else {
264 table_view_->SetEnabled(true); 318 table_view_->SetEnabled(true);
265 } 319 }
266 } 320 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698