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

Unified Diff: ash/common/system/tray/special_popup_row.h

Issue 2429923002: Implement all system menu title row buttons for Ash MD (Closed)
Patch Set: OS_WIN define in tests Created 4 years, 2 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
« no previous file with comments | « ash/common/system/tiles/tray_tiles_unittest.cc ('k') | ash/common/system/tray/special_popup_row.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
+ 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_;
« no previous file with comments | « ash/common/system/tiles/tray_tiles_unittest.cc ('k') | ash/common/system/tray/special_popup_row.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698