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

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

Powered by Google App Engine
This is Rietveld 408576698