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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/chooser_content_view.cc
diff --git a/chrome/browser/ui/views/chooser_content_view.cc b/chrome/browser/ui/views/chooser_content_view.cc
index c4b1ab03922943b32c8225ff36334fe5e45e1a0e..5d6ed2a814dc59b002408ee40ce78d036febcbbb 100644
--- a/chrome/browser/ui/views/chooser_content_view.cc
+++ b/chrome/browser/ui/views/chooser_content_view.cc
@@ -9,6 +9,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/color_palette.h"
+#include "ui/gfx/geometry/point.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/vector_icons_public.h"
@@ -17,7 +18,7 @@
#include "ui/views/controls/styled_label.h"
#include "ui/views/controls/table/table_view.h"
#include "ui/views/controls/throbber.h"
-#include "ui/views/layout/fill_layout.h"
+#include "ui/views/layout/layout_manager.h"
namespace {
@@ -27,11 +28,46 @@ const int kChooserHeight = 220;
const int kThrobberDiameter = 24;
+const int kAdapterOffHelpLinkPadding = 5;
+
// The lookup table for signal strength level image.
const int kSignalStrengthLevelImageIds[5] = {IDR_SIGNAL_0_BAR, IDR_SIGNAL_1_BAR,
IDR_SIGNAL_2_BAR, IDR_SIGNAL_3_BAR,
IDR_SIGNAL_4_BAR};
+class ChooserContentViewLayout : public views::LayoutManager {
sky 2016/09/19 20:12:51 ChooserContentViewLayoutManager.
juncai 2016/09/19 23:35:28 Done.
+ public:
+ ChooserContentViewLayout(views::View* table_parent,
+ views::View* throbber,
+ views::View* turn_adapter_off_help)
+ : table_parent_(table_parent),
+ throbber_(throbber),
+ turn_adapter_off_help_(turn_adapter_off_help) {}
+
+ // views::LayoutManager:
+ void Layout(views::View* host) override {
+ table_parent_->SetBoundsRect(host->GetContentsBounds());
+ // Set the throbber in the center of the chooser.
+ throbber_->SetBounds((kChooserWidth - kThrobberDiameter) / 2,
+ (kChooserHeight - kThrobberDiameter) / 2,
+ kThrobberDiameter, kThrobberDiameter);
+ turn_adapter_off_help_->SetPosition(
+ 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
+ }
+
+ // views::LayoutManager:
+ gfx::Size GetPreferredSize(const views::View* host) const override {
+ return host->GetPreferredSize();
sky 2016/09/19 20:12:51 View::GetPreferredSize calls to the LayoutManager:
juncai 2016/09/19 23:35:29 Done.
+ }
+
+ ~ChooserContentViewLayout() override {}
sky 2016/09/19 20:12:51 This should be right after the constructor.
juncai 2016/09/19 23:35:29 Done.
+
+ private:
+ views::View* table_parent_;
+ views::View* throbber_;
+ views::View* turn_adapter_off_help_;
+};
sky 2016/09/19 20:12:51 DISALLOW...
juncai 2016/09/19 23:35:28 Done.
+
} // namespace
ChooserContentView::ChooserContentView(
@@ -50,23 +86,33 @@ ChooserContentView::ChooserContentView(
table_view_->SetObserver(table_view_observer);
table_view_->SetEnabled(chooser_controller_->NumOptions() > 0);
- SetLayoutManager(new views::FillLayout());
views::View* table_parent = table_view_->CreateParentIfNecessary();
AddChildView(table_parent);
throbber_ = new views::Throbber();
- // Set the throbber in the center of the chooser.
- throbber_->SetBounds((kChooserWidth - kThrobberDiameter) / 2,
- (kChooserHeight - kThrobberDiameter) / 2,
- kThrobberDiameter, kThrobberDiameter);
throbber_->SetVisible(false);
AddChildView(throbber_);
+
+ 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.
+ l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_TURN_ADAPTER_OFF));
+ turn_adapter_off_help_->SetHandlesTooltips(false);
+ turn_adapter_off_help_->SetUnderline(false);
+ turn_adapter_off_help_->SetMultiLine(true);
+ turn_adapter_off_help_->SizeToFit(kChooserWidth);
+ turn_adapter_off_help_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+ turn_adapter_off_help_->set_listener(this);
+ turn_adapter_off_help_->SetVisible(false);
+ AddChildView(turn_adapter_off_help_);
+
+ SetLayoutManager(new ChooserContentViewLayout(table_parent, throbber_,
+ turn_adapter_off_help_));
}
ChooserContentView::~ChooserContentView() {
chooser_controller_->set_view(nullptr);
table_view_->SetObserver(nullptr);
table_view_->SetModel(nullptr);
+ turn_adapter_off_help_->set_listener(nullptr);
if (discovery_state_)
discovery_state_->set_listener(nullptr);
}
@@ -159,7 +205,8 @@ void ChooserContentView::OnAdapterEnabledChanged(bool enabled) {
// of a previously selected row.
table_view_->Select(-1);
UpdateTableView();
- table_view_->SetVisible(true);
+ 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
+ turn_adapter_off_help_->SetVisible(!enabled);
throbber_->Stop();
throbber_->SetVisible(false);
@@ -195,7 +242,12 @@ void ChooserContentView::OnRefreshStateChanged(bool refreshing) {
}
void ChooserContentView::LinkClicked(views::Link* source, int event_flags) {
- chooser_controller_->RefreshOptions();
+ if (source == discovery_state_)
+ chooser_controller_->RefreshOptions();
+ else if (source == turn_adapter_off_help_)
+ chooser_controller_->OpenAdapterOffHelpUrl();
+ else
+ NOTREACHED();
}
void ChooserContentView::StyledLabelLinkClicked(views::StyledLabel* label,
« 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