Adjust TriView.

ash/common/system/tray/tri_view.h

Index: ash/common/system/tray/tri_view.h
diff --git a/ash/common/system/tray/tri_view.h b/ash/common/system/tray/tri_view.h
index 79851c5257ffb20579ad8aec90993b2c3aca67e5..5bb6ed6e554c7bfa3b5b29d3e1bf835b805a313b 100644
--- a/ash/common/system/tray/tri_view.h
+++ b/ash/common/system/tray/tri_view.h
@@ -70,10 +70,6 @@ class ASH_EXPORT TriView : public views::View {
 
   ~TriView() override;
 
-  // Set the minimum cross axis size, i.e. the minimum height for a horizontal
-  // orientation.
-  void SetMinCrossAxisSize(int min_size);
-
   // Set the minimum size for the given |container|.
   void SetMinSize(Container container, const gfx::Size& size);
 
@@ -126,15 +122,11 @@ class ASH_EXPORT TriView : public views::View {
  private:
   friend class TriViewTest;
 
-  // Creates a default LayoutManager for the given |orientation|.
-  std::unique_ptr<views::LayoutManager> CreateDefaultLayoutManager(

[bruthig, 2016/11/10 18:33:40]

If you are removing TrayPopupUtils::CreateDefaultLayout() then this function may
need to be made available to clients to support the changes in:
https://codereview.chromium.org/2482043002 and we probably shouldn't move it to
be an anonymous helper.

[Evan Stade, 2016/11/10 19:18:05]

I don't think so. We just won't set the layout manager for the start/end
containers and thus get the TriView defaults for those, which is what we want.

[bruthig, 2016/11/10 20:51:16]

I don't think you followed my train of thought, let me try again.  Because the
audio row (VolumeView) has multiple target-able views the mentioned change is
installing the default layout managers used by the START/END containers onto its
own container views. Specifically the VolumeView::more_button_ and icon_
buttons. i.e. these default layout managers are being installed directly on
non-TriView containers, e.g. buttons, to allow each container to be target-able
but have the same layout as if they were added to the TriView.

It might make more sense once you try to merge.

[Evan Stade, 2016/11/11 01:29:13]

ah, I only looked at TrayPopupUtils in that CL. Guess I'll see what happens when
I merge that change in.

-      Orientation orientation) const;
-
   // Returns the View for the given |container|.
-  views::View* GetContainer(Container container) const;

[Evan Stade, 2016/11/09 23:32:15]

these functions should not be const because they return non-const pointers to
member variables. (There's also no need for them to be const.)

[bruthig, 2016/11/10 18:33:40]

Acknowledged, thx for fixing.

+  views::View* GetContainer(Container container);
 
   // Returns the layout manager for the given |container|.
-  SizeRangeLayout* GetLayoutManager(Container container) const;
+  SizeRangeLayout* GetLayoutManager(Container container);
 
   // Type spcific layout manager installed on |this|. Responsible for laying out
   // the container Views.