Modify Ash MD system menu layout for title rows

ash/common/system/tray/tray_details_view.h

 // Copyright (c) 2012 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_TRAY_DETAILS_VIEW_H_
 #define ASH_COMMON_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_
 
 #include "ash/ash_export.h"
 #include "ash/common/system/tray/special_popup_row.h"
+#include "ash/common/system/tray/system_menu_button.h"

[bruthig, 2016/11/14 04:39:11]

nit: Is this needed?

[tdanderson, 2016/11/14 19:24:59]

Done.

+#include "ash/common/system/tray/tri_view.h"

[bruthig, 2016/11/14 04:39:11]

nit: This could be a forward declaration.

[tdanderson, 2016/11/14 19:24:59]

Done.

 #include "ash/common/system/tray/view_click_listener.h"
 #include "base/macros.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
 
 namespace views {
 class BoxLayout;
+class Label;
+class ProgressBar;
 class ScrollView;
-class ProgressBar;
 }  // namespace views
 
 namespace ash {
 namespace test {
 class TrayDetailsViewTest;
 }  // namespace test
 
 class FixedSizedScrollView;
 class ScrollBorder;
 class SystemTrayItem;
@@ skipping 37 matching lines @@
   void AddScrollSeparator();
 
   // Removes (and destroys) all child views.
   void Reset();
 
   // Shows or hides the progress bar below the title row. It occupies the same
   // space as the separator, so when shown the separator is hidden. If
   // |progress_bar_| doesn't already exist it will be created.
   void ShowProgress(double value, bool visible);
 
+  views::CustomButton* CreateSettingsButton(LoginStatus status);

[bruthig, 2016/11/14 04:39:11]

Can you mention that the caller assumes ownership?
Same applies to CreateBackButton().

[tdanderson, 2016/11/14 19:24:59]

Done.

+  views::CustomButton* CreateHelpButton(LoginStatus status);
+
+  TriView* tri_view() { return tri_view_; }
+
  private:
   friend class test::TrayDetailsViewTest;
 
   // Overridden to handle clicks on subclass-specific views.
   virtual void HandleViewClicked(views::View* view);
 
   // Overridden to handle button presses on subclass-specific buttons.
   virtual void HandleButtonPressed(views::Button* sender,
                                    const ui::Event& event);
 
   // Creates and adds subclass-specific buttons to the title row.
   virtual void CreateExtraTitleRowButtons();
 
   // Transition to default view from details view. If |title_row_| has focus
   // before transition, the default view should focus on the owner of this
   // details view.
   void TransitionToDefaultView();
 
+  // Helper function which creates and returns the back button used in the
+  // material design top-most header row.
+  views::Button* CreateBackButton();
+
   SystemTrayItem* owner_;
   views::BoxLayout* box_layout_;
-  SpecialPopupRow* title_row_;
+  SpecialPopupRow* title_row_;  // Not used in material design.
   FixedSizedScrollView* scroller_;
   views::View* scroll_content_;
   views::ProgressBar* progress_bar_;
 
   ScrollBorder* scroll_border_;  // Weak reference
 
+  // The container view for the top-most title row in material design.
+  TriView* tri_view_;
+
+  // The label used in the top-most title row for material design.
+  views::Label* label_;
+
   // The back button that appears in the material design title row. Not owned.
   views::Button* back_button_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayDetailsView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_