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

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

Issue 2155743002: Add throbber and status text to WebBluetooth chooser UI on non-Mac desktops (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed some unnecessary include files and forward declarations Created 4 years, 5 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 "chrome/browser/chooser_controller/chooser_controller.h"
8 #include "chrome/grit/generated_resources.h" 7 #include "chrome/grit/generated_resources.h"
9 #include "ui/base/l10n/l10n_util.h" 8 #include "ui/base/l10n/l10n_util.h"
10 #include "ui/base/models/table_model.h" 9 #include "ui/views/controls/link.h"
11 #include "ui/views/controls/styled_label.h" 10 #include "ui/views/controls/styled_label.h"
12 #include "ui/views/controls/table/table_view.h" 11 #include "ui/views/controls/table/table_view.h"
13 #include "ui/views/controls/table/table_view_observer.h" 12 #include "ui/views/controls/throbber.h"
14 #include "ui/views/layout/box_layout.h" 13 #include "ui/views/layout/fill_layout.h"
15 #include "ui/views/layout/layout_constants.h"
16 14
17 namespace { 15 namespace {
18 16
19 const int kChooserWidth = 300; 17 const int kChooserWidth = 330;
20 18
21 const int kChooserHeight = 200; 19 const int kChooserHeight = 220;
20
21 const int kThrobberDiameter = 50;
22 22
23 } // namespace 23 } // namespace
24 24
25 class ChooserTableModel : public ui::TableModel, 25 ChooserContentView::ChooserContentView(
26 public ChooserController::Observer { 26 views::TableViewObserver* table_view_observer,
27 public: 27 std::unique_ptr<ChooserController> chooser_controller)
28 explicit ChooserTableModel(ChooserController* chooser_controller); 28 : chooser_controller_(std::move(chooser_controller)) {
29 ~ChooserTableModel() override; 29 chooser_controller_->set_observer(this);
30 std::vector<ui::TableColumn> table_columns;
31 table_columns.push_back(ui::TableColumn());
32 table_view_ =
33 new views::TableView(this, table_columns, views::TEXT_ONLY, true);
34 table_view_->set_select_on_remove(false);
35 table_view_->SetObserver(table_view_observer);
36 table_view_->SetEnabled(chooser_controller_->NumOptions() > 0);
30 37
31 // ui::TableModel: 38 views::FillLayout* layout = new views::FillLayout();
32 int RowCount() override; 39 SetLayoutManager(layout);
33 base::string16 GetText(int row, int column_id) override; 40 views::View* table_parent = table_view_->CreateParentIfNecessary();
34 void SetObserver(ui::TableModelObserver* observer) override; 41 AddChildView(table_parent);
35 42
36 // ChooserController::Observer: 43 if (chooser_controller_->NeedsThrobber()) {
37 void OnOptionsInitialized() override; 44 throbber_ = new views::Throbber();
38 void OnOptionAdded(size_t index) override; 45 // Set the throbber in the center of the chooser rectangular.
39 void OnOptionRemoved(size_t index) override; 46 throbber_->SetBounds((kChooserWidth - kThrobberDiameter) / 2,
40 47 (kChooserHeight - kThrobberDiameter) / 2,
41 void Update(); 48 kThrobberDiameter, kThrobberDiameter);
42 void ChooserControllerDestroying(); 49 throbber_->SetVisible(false);
43 50 AddChildView(throbber_);
44 private: 51 }
45 ui::TableModelObserver* observer_;
46 ChooserController* chooser_controller_;
47
48 DISALLOW_COPY_AND_ASSIGN(ChooserTableModel);
49 };
50
51 ChooserTableModel::ChooserTableModel(ChooserController* chooser_controller)
52 : observer_(nullptr), chooser_controller_(chooser_controller) {
53 chooser_controller_->set_observer(this);
54 } 52 }
55 53
56 ChooserTableModel::~ChooserTableModel() { 54 ChooserContentView::~ChooserContentView() {
57 chooser_controller_->set_observer(nullptr); 55 chooser_controller_->set_observer(nullptr);
56 table_view_->SetObserver(nullptr);
57 table_view_->SetModel(nullptr);
58 if (discovery_state_)
59 discovery_state_->set_listener(nullptr);
58 } 60 }
59 61
60 int ChooserTableModel::RowCount() { 62 gfx::Size ChooserContentView::GetPreferredSize() const {
63 return gfx::Size(kChooserWidth, kChooserHeight);
64 }
65
66 int ChooserContentView::RowCount() {
61 // When there are no devices, the table contains a message saying there 67 // When there are no devices, the table contains a message saying there
62 // are no devices, so the number of rows is always at least 1. 68 // are no devices, so the number of rows is always at least 1.
63 return std::max(static_cast<int>(chooser_controller_->NumOptions()), 1); 69 return std::max(static_cast<int>(chooser_controller_->NumOptions()), 1);
64 } 70 }
65 71
66 base::string16 ChooserTableModel::GetText(int row, int column_id) { 72 base::string16 ChooserContentView::GetText(int row, int column_id) {
67 int num_options = static_cast<int>(chooser_controller_->NumOptions()); 73 int num_options = static_cast<int>(chooser_controller_->NumOptions());
68 if (num_options == 0) { 74 if (num_options == 0) {
69 DCHECK_EQ(0, row); 75 DCHECK_EQ(0, row);
70 return l10n_util::GetStringUTF16( 76 return l10n_util::GetStringUTF16(
71 IDS_DEVICE_CHOOSER_NO_DEVICES_FOUND_PROMPT); 77 IDS_DEVICE_CHOOSER_NO_DEVICES_FOUND_PROMPT);
72 } 78 }
73 79
74 DCHECK_GE(row, 0); 80 DCHECK_GE(row, 0);
75 DCHECK_LT(row, num_options); 81 DCHECK_LT(row, num_options);
76 return chooser_controller_->GetOption(static_cast<size_t>(row)); 82 return chooser_controller_->GetOption(static_cast<size_t>(row));
77 } 83 }
78 84
79 void ChooserTableModel::SetObserver(ui::TableModelObserver* observer) { 85 void ChooserContentView::SetObserver(ui::TableModelObserver* observer) {}
80 observer_ = observer; 86
87 void ChooserContentView::OnOptionsInitialized() {
88 table_view_->OnModelChanged();
89 UpdateTableView();
81 } 90 }
82 91
83 void ChooserTableModel::OnOptionsInitialized() { 92 void ChooserContentView::OnOptionAdded(size_t index) {
84 if (observer_) { 93 table_view_->OnItemsAdded(static_cast<int>(index), 1);
85 observer_->OnModelChanged(); 94 UpdateTableView();
86 Update();
87 }
88 } 95 }
89 96
90 void ChooserTableModel::OnOptionAdded(size_t index) { 97 void ChooserContentView::OnOptionRemoved(size_t index) {
91 if (observer_) { 98 table_view_->OnItemsRemoved(static_cast<int>(index), 1);
92 observer_->OnItemsAdded(static_cast<int>(index), 1); 99 UpdateTableView();
93 Update();
94 }
95 } 100 }
96 101
97 void ChooserTableModel::OnOptionRemoved(size_t index) { 102 void ChooserContentView::AdapterOn() {
98 if (observer_) { 103 table_view_->Select(-1);
99 observer_->OnItemsRemoved(static_cast<int>(index), 1); 104 UpdateTableView();
100 Update(); 105 discovery_state_->SetText(
101 } 106 l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_RE_SCAN));
107 // Enable |discovery_state_| to show it as a link.
108 discovery_state_->SetEnabled(true);
102 } 109 }
103 110
104 void ChooserTableModel::Update() { 111 void ChooserContentView::AdapterOff() {
105 views::TableView* table_view = static_cast<views::TableView*>(observer_); 112 // No row is selected since the adapter is off.
106 113 // This will also disable the OK button if it is enabled because
107 if (chooser_controller_->NumOptions() == 0) { 114 // of previously selected row.
108 observer_->OnModelChanged(); 115 table_view_->Select(-1);
109 table_view->SetEnabled(false); 116 UpdateTableView();
110 } else { 117 table_view_->SetVisible(true);
111 table_view->SetEnabled(true); 118 throbber_->Stop();
112 } 119 throbber_->SetVisible(false);
120 discovery_state_->SetText(l10n_util::GetStringUTF16(
121 IDS_BLUETOOTH_DEVICE_CHOOSER_BLUETOOTH_ADAPTER_OFF));
122 // Disable |discovery_state_| to show it as a text label instead of a link.
123 discovery_state_->SetEnabled(false);
113 } 124 }
114 125
115 ChooserContentView::ChooserContentView( 126 void ChooserContentView::Refresh() {
116 views::TableViewObserver* observer, 127 // No row is selected since |table_view_| will be refreshed.
117 std::unique_ptr<ChooserController> chooser_controller) 128 // This will also disable the OK button if it is enabled because
118 : chooser_controller_(std::move(chooser_controller)), table_view_(nullptr) { 129 // of previously selected row.
119 std::vector<ui::TableColumn> table_columns; 130 table_view_->Select(-1);
120 table_columns.push_back(ui::TableColumn()); 131 UpdateTableView();
121 chooser_table_model_.reset(new ChooserTableModel(chooser_controller_.get())); 132 // Hide |table_view_| and make |throbber_| visible.
122 table_view_ = new views::TableView(chooser_table_model_.get(), table_columns, 133 table_view_->SetVisible(false);
123 views::TEXT_ONLY, true); 134 throbber_->Start();
124 table_view_->set_select_on_remove(false); 135 throbber_->SetVisible(true);
125 chooser_table_model_->SetObserver(table_view_); 136 discovery_state_->SetText(
126 table_view_->SetObserver(observer); 137 l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_SCANNING));
127 table_view_->SetEnabled(chooser_controller_->NumOptions() > 0); 138 // Disable |discovery_state_| to show it as a text label instead of a link.
128 139 discovery_state_->SetEnabled(false);
129 views::BoxLayout* layout = new views::BoxLayout(
130 views::BoxLayout::kVertical, 0, 0, views::kRelatedControlVerticalSpacing);
131 SetLayoutManager(layout);
132 views::View* table_parent = table_view_->CreateParentIfNecessary();
133 AddChildView(table_parent);
134 layout->SetFlexForView(table_parent, 1);
135 } 140 }
136 141
137 ChooserContentView::~ChooserContentView() { 142 void ChooserContentView::Idle() {
138 table_view_->SetModel(nullptr); 143 table_view_->Select(-1);
139 chooser_table_model_->SetObserver(nullptr); 144 UpdateTableView();
145 // Hide |throbber_| and make |table_view_| visible.
146 table_view_->SetVisible(true);
147 throbber_->Stop();
148 throbber_->SetVisible(false);
149 discovery_state_->SetText(
150 l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_RE_SCAN));
151 // Enable |discovery_state_| to show it as a link.
152 discovery_state_->SetEnabled(true);
140 } 153 }
141 154
142 gfx::Size ChooserContentView::GetPreferredSize() const { 155 void ChooserContentView::LinkClicked(views::Link* source, int event_flags) {
143 return gfx::Size(kChooserWidth, kChooserHeight); 156 chooser_controller_->RefreshOptions();
157 }
158
159 void ChooserContentView::StyledLabelLinkClicked(views::StyledLabel* label,
160 const gfx::Range& range,
161 int event_flags) {
162 chooser_controller_->OpenHelpCenterUrl();
144 } 163 }
145 164
146 base::string16 ChooserContentView::GetWindowTitle() const { 165 base::string16 ChooserContentView::GetWindowTitle() const {
147 return chooser_controller_->GetTitle(); 166 return chooser_controller_->GetTitle();
148 } 167 }
149 168
150 base::string16 ChooserContentView::GetDialogButtonLabel( 169 base::string16 ChooserContentView::GetDialogButtonLabel(
151 ui::DialogButton button) const { 170 ui::DialogButton button) const {
152 return button == ui::DIALOG_BUTTON_OK 171 return button == ui::DIALOG_BUTTON_OK
153 ? chooser_controller_->GetOkButtonLabel() 172 ? chooser_controller_->GetOkButtonLabel()
154 : l10n_util::GetStringUTF16(IDS_DEVICE_CHOOSER_CANCEL_BUTTON_TEXT); 173 : l10n_util::GetStringUTF16(IDS_DEVICE_CHOOSER_CANCEL_BUTTON_TEXT);
155 } 174 }
156 175
157 bool ChooserContentView::IsDialogButtonEnabled(ui::DialogButton button) const { 176 bool ChooserContentView::IsDialogButtonEnabled(ui::DialogButton button) const {
158 return button != ui::DIALOG_BUTTON_OK || 177 return button != ui::DIALOG_BUTTON_OK ||
159 !table_view_->selection_model().empty(); 178 !table_view_->selection_model().empty();
160 } 179 }
161 180
162 views::StyledLabel* ChooserContentView::CreateFootnoteView( 181 views::View* ChooserContentView::CreateExtraView() {
163 views::StyledLabelListener* listener) const { 182 if (chooser_controller_->NeedsStatus()) {
183 discovery_state_ = new views::Link(
184 l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_RE_SCAN));
185 discovery_state_->SetHandlesTooltips(false);
186 discovery_state_->SetUnderline(false);
187 discovery_state_->set_listener(this);
188 }
189
190 return discovery_state_;
191 }
192
193 views::StyledLabel* ChooserContentView::CreateFootnoteView() {
164 base::string16 link = 194 base::string16 link =
165 l10n_util::GetStringUTF16(IDS_DEVICE_CHOOSER_GET_HELP_LINK_TEXT); 195 l10n_util::GetStringUTF16(IDS_DEVICE_CHOOSER_GET_HELP_LINK_TEXT);
166 size_t offset = 0; 196 size_t offset = 0;
167 base::string16 text = l10n_util::GetStringFUTF16( 197 base::string16 text = l10n_util::GetStringFUTF16(
168 IDS_DEVICE_CHOOSER_FOOTNOTE_TEXT, link, &offset); 198 IDS_DEVICE_CHOOSER_FOOTNOTE_TEXT, link, &offset);
169 views::StyledLabel* styled_label = new views::StyledLabel(text, listener); 199 views::StyledLabel* styled_label = new views::StyledLabel(text, this);
170 styled_label->AddStyleRange( 200 styled_label->AddStyleRange(
171 gfx::Range(offset, offset + link.length()), 201 gfx::Range(offset, offset + link.length()),
172 views::StyledLabel::RangeStyleInfo::CreateForLink()); 202 views::StyledLabel::RangeStyleInfo::CreateForLink());
173 return styled_label; 203 return styled_label;
174 } 204 }
175 205
176 void ChooserContentView::Accept() { 206 void ChooserContentView::Accept() {
177 chooser_controller_->Select(table_view_->selection_model().active()); 207 chooser_controller_->Select(table_view_->selection_model().active());
178 } 208 }
179 209
180 void ChooserContentView::Cancel() { 210 void ChooserContentView::Cancel() {
181 chooser_controller_->Cancel(); 211 chooser_controller_->Cancel();
182 } 212 }
183 213
184 void ChooserContentView::Close() { 214 void ChooserContentView::Close() {
185 chooser_controller_->Close(); 215 chooser_controller_->Close();
186 } 216 }
187 217
188 void ChooserContentView::StyledLabelLinkClicked() { 218 void ChooserContentView::UpdateTableView() {
189 chooser_controller_->OpenHelpCenterUrl(); 219 if (chooser_controller_->NumOptions() == 0) {
220 table_view_->OnModelChanged();
221 table_view_->SetEnabled(false);
222 } else {
223 table_view_->SetEnabled(true);
224 }
190 } 225 }
191
192 void ChooserContentView::UpdateTableModel() {
193 chooser_table_model_->Update();
194 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698