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

Unified Diff: ash/system/tray/tray_details_view.h

Issue 2957043002: Add a row in the network tray to inform users to turn Bluetooth on to enable Tether. (Closed)
Patch Set: added actions and slightly refactored the infolabel class Created 3 years, 6 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: ash/system/tray/tray_details_view.h
diff --git a/ash/system/tray/tray_details_view.h b/ash/system/tray/tray_details_view.h
index f046fcdcdeec65b9c5ef0b51d7c26a5ff1a25161..15be1243860732064b7883cced404bcaf13341f0 100644
--- a/ash/system/tray/tray_details_view.h
+++ b/ash/system/tray/tray_details_view.h
@@ -8,6 +8,7 @@
#include <memory>
#include "ash/ash_export.h"
+#include "ash/system/tray/actionable_view.h"
#include "ash/system/tray/tray_constants.h"
#include "ash/system/tray/view_click_listener.h"
#include "base/macros.h"
@@ -58,16 +59,26 @@ class ASH_EXPORT TrayDetailsView : public views::View,
// A view containing only a label, which is to be inserted as a non-targetable
// row within a system menu detailed view (e.g., the "Scanning for devices..."
// message that can appear at the top of the Bluetooth detailed view).
tdanderson 2017/06/27 19:33:21 By making InfoLabel an ActionableView, you would b
Kyle Horimoto 2017/06/27 20:37:10 Good point. Would you suggest creating a specific
tdanderson 2017/06/27 21:27:39 I'll leave it to Leslie to investigate possible ap
- class InfoLabel : public View {
+ class InfoLabel : public ActionableView {
public:
explicit InfoLabel(int message_id);
- ~InfoLabel() override;
+ void Update(int message_id);
Kyle Horimoto 2017/06/27 19:36:57 Please add documentation to explain what Update()
- void SetMessage(int message_id);
+ enum Action { NONE, OPEN_BLUETOOTH_SETTINGS };
+
+ protected:
+ // ActionableView
tdanderson 2017/06/27 19:33:21 nit: ':' at end of 'ActionableView'
Kyle Horimoto 2017/06/27 19:36:57 Colon at the end of the line: // ActionableView:
+ bool PerformAction(const ui::Event& event) override;
private:
+ void SetAction(int message_id);
+ void SetStyle();
+ void SetMessage(int message_id);
+
views::Label* const label_;
+ Action action_;
+
DISALLOW_COPY_AND_ASSIGN(InfoLabel);
};

Powered by Google App Engine
This is Rietveld 408576698