Implement all system menu title row buttons for Ash MD

ash/common/system/tray/special_popup_row.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_COMMON_SYSTEM_TRAY_SPECIAL_POPUP_ROW_H_
 #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"
 #include "ui/views/view.h"
 
 namespace views {
 class Button;
 class ButtonListener;
 class Label;
 class ToggleButton;
@@ skipping 23 matching lines @@
   // Sets |content_| to be |view| and adds |content_| as a child view of this
   // row. This should only be called once, upon initialization of the row.
   // TODO(tdanderson): Make this private when material design is enabled by
   // default. See crbug.com/614453.
   void SetContent(views::View* view);
 
   // Creates UI elements for the material design title row and adds them to
   // 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() convenience functions and
instead having all clients just create their own button and call into
AddViewToTitleRow(). See for example what I do in
NetworkStateListDetailedView::CreateExtraTitleRowButtons(). What are your
thoughts?

[bruthig, 2016/10/19 15:43:09]

As discussed offline, I think we should keep them.  It will make it easier to
migrate them to control building factory and the AddViewToTitleRow() should be
removed once the new layout managers land.

[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.
   // See crbug.com/614453.
   void AddViewToRowNonMd(views::View* view, bool add_separator);
 
   // TODO(tdanderson): Remove this accessor when material design is enabled by
   // default. See crbug.com/614453.
   views::View* content() const { return content_; }
 
  private:
   // views::View:
   gfx::Size GetPreferredSize() const override;
   int GetHeightForWidth(int width) const override;
   void Layout() override;
   void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
 
   // Updates the style of |label_|, if it exists. Only used in material design.
   void UpdateStyle();
 
   // Used to add views to |views_before_content_container_| and
   // |views_after_content_container_|, respectively. Views are added to both
   // containers in a left-to-right order.
   void AddViewBeforeContent(views::View* view);
   void AddViewAfterContent(views::View* view);
   void AddViewAfterContent(views::View* view, bool add_separator);
 
   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_;
 
   // The main content of this row, typically a label.
   views::View* content_;
 
   // The container for the views positioned after |content_|.
   views::View* views_after_content_container_;
 
   // A pointer to the label which is parented to |content_|; this is non-null
   // only if this row's content is a single label. Not owned.
   views::Label* label_;
 
   DISALLOW_COPY_AND_ASSIGN(SpecialPopupRow);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_TRAY_SPECIAL_POPUP_ROW_H_