Chromium Code Reviews| 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..60d2a2286bfdfa288f6a86bbe9f3b96de59ea4ab 100644 |
| --- a/ash/system/tray/tray_details_view.h |
| +++ b/ash/system/tray/tray_details_view.h |
| @@ -8,11 +8,13 @@ |
| #include <memory> |
| #include "ash/ash_export.h" |
| +#include "ash/system/tray/actionable_view.h" |
|
Kyle Horimoto
2017/07/12 22:45:58
Remove.
lesliewatkins
2017/07/13 22:12:47
Done.
|
| #include "ash/system/tray/tray_constants.h" |
| #include "ash/system/tray/view_click_listener.h" |
| #include "base/macros.h" |
| #include "base/timer/timer.h" |
| #include "ui/views/controls/button/button.h" |
| +#include "ui/views/controls/button/label_button.h" |
|
Kyle Horimoto
2017/07/12 22:45:58
Remove.
lesliewatkins
2017/07/13 22:12:47
Done.
|
| #include "ui/views/view.h" |
| namespace gfx { |
| @@ -22,7 +24,6 @@ struct VectorIcon; |
| namespace views { |
| class BoxLayout; |
| class CustomButton; |
| -class Label; |
| class ProgressBar; |
| class ScrollView; |
| } // namespace views |
| @@ -54,23 +55,15 @@ class ASH_EXPORT TrayDetailsView : public views::View, |
| SystemTrayItem* owner() { return owner_; } |
| - protected: |
| - // 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). |
| - class InfoLabel : public View { |
| + // A delegate for handling actions when an InfoLabel is clicked. |
| + class TrayDetailClickHandler { |
|
Kyle Horimoto
2017/07/12 22:45:58
Remove.
lesliewatkins
2017/07/13 22:12:47
Done.
|
| public: |
| - explicit InfoLabel(int message_id); |
| - ~InfoLabel() override; |
| - |
| - void SetMessage(int message_id); |
| - |
| - private: |
| - views::Label* const label_; |
| - |
| - DISALLOW_COPY_AND_ASSIGN(InfoLabel); |
| + virtual ~TrayDetailClickHandler(){}; |
| + virtual void OnTrayDetailClicked(int message_id) = 0; |
| + virtual bool TrayDetailIsClickable(int message_id) = 0; |
| }; |
| + protected: |
| // views::View: |
| void Layout() override; |
| int GetHeightForWidth(int width) const override; |