Chromium Code Reviews| Index: ash/common/system/tray/special_popup_row.h |
| diff --git a/ash/common/system/tray/special_popup_row.h b/ash/common/system/tray/special_popup_row.h |
| index 3f156b425965299914956f433996f05bfb83e053..fc185b05a6bf584c363dfc07cb49dd88b7ab9977 100644 |
| --- a/ash/common/system/tray/special_popup_row.h |
| +++ b/ash/common/system/tray/special_popup_row.h |
| @@ -6,6 +6,7 @@ |
| #define ASH_COMMON_SYSTEM_TRAY_SPECIAL_POPUP_ROW_H_ |
| #include "ash/ash_export.h" |
| +#include "ash/common/login_status.h" |
| #include "ash/resources/vector_icons/vector_icons.h" |
| #include "base/macros.h" |
| #include "ui/gfx/geometry/size.h" |
| @@ -49,9 +50,15 @@ class ASH_EXPORT SpecialPopupRow : public views::View { |
| // the view hierarchy rooted at |this|. Returns a pointer to the created |
| // view. |
| views::Button* AddBackButton(views::ButtonListener* listener); |
| - views::Button* AddSettingsButton(views::ButtonListener* listener); |
| + views::Button* AddSettingsButton(views::ButtonListener* listener, |
|
tdanderson
2016/10/18 20:57:47
Ben, I'm thinking of killing off these Add*Button(
bruthig
2016/10/19 15:43:09
As discussed offline, I think we should keep them.
tdanderson
2016/10/19 19:49:31
Acknowledged.
|
| + LoginStatus status); |
| + views::Button* AddHelpButton(views::ButtonListener* listener, |
| + LoginStatus status); |
| views::ToggleButton* AddToggleButton(views::ButtonListener* listener); |
| + // Adds |view| after this row's content. |
| + void AddViewToTitleRow(views::View* view); |
| + |
| // Adds |view| after this row's content, optionally with a separator. Only |
| // used for non-MD. |
| // TODO(tdanderson): Remove this when material design is enabled by default. |
| @@ -81,10 +88,6 @@ class ASH_EXPORT SpecialPopupRow : public views::View { |
| void SetTextLabelMd(int string_id, ViewClickListener* listener); |
| void SetTextLabelNonMd(int string_id, ViewClickListener* listener); |
| - SystemMenuButton* AddSystemMenuButton(views::ButtonListener* listener, |
| - const gfx::VectorIcon& icon, |
| - int accessible_name_id, |
| - bool after_content); |
| // The container for the views positioned before |content_|. |
| views::View* views_before_content_container_; |