Make LogoutButtonTray a regular View

ash/system/tray/tray_container.cc

Index: ash/system/tray/tray_container.cc
diff --git a/ash/system/tray/tray_container.cc b/ash/system/tray/tray_container.cc
new file mode 100644
index 0000000000000000000000000000000000000000..0514967b3e29b6c0283d1cf4330c86a81c6e7de7
--- /dev/null
+++ b/ash/system/tray/tray_container.cc
@@ -0,0 +1,80 @@
+// Copyright 2017 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.
+
+#include "ash/system/tray/tray_container.h"
+
+#include <utility>
+
+#include "ash/shelf/wm_shelf.h"
+#include "ash/system/tray/tray_constants.h"
+#include "ui/gfx/geometry/insets.h"
+#include "ui/views/border.h"
+#include "ui/views/layout/box_layout.h"
+
+namespace ash {
+
+TrayContainer::TrayContainer(WmShelf* wm_shelf) : wm_shelf_(wm_shelf) {
+  DCHECK(wm_shelf_);
+
+  UpdateLayout();
+}
+
+TrayContainer::~TrayContainer() {}
+
+void TrayContainer::UpdateAfterShelfAlignmentChange() {
+  UpdateLayout();
+}
+
+void TrayContainer::SetMargin(int main_axis_margin, int cross_axis_margin) {
+  main_axis_margin_ = main_axis_margin;
+  cross_axis_margin_ = cross_axis_margin;
+  UpdateLayout();
+}
+
+void TrayContainer::ChildPreferredSizeChanged(views::View* child) {
+  PreferredSizeChanged();
+}
+
+void TrayContainer::ChildVisibilityChanged(View* child) {
+  PreferredSizeChanged();
+}
+
+void TrayContainer::ViewHierarchyChanged(
+    const ViewHierarchyChangedDetails& details) {
+  if (details.parent == this)
+    PreferredSizeChanged();
+}
+
+void TrayContainer::UpdateLayout() {
+  const bool is_horizontal = wm_shelf_->IsHorizontalAlignment();
+
+  // Adjust the size of status tray dark background by adding additional
+  // empty border.
+  views::BoxLayout::Orientation orientation =
+      is_horizontal ? views::BoxLayout::kHorizontal
+                    : views::BoxLayout::kVertical;
+
+  const int hit_region_with_separator = kHitRegionPadding + kSeparatorWidth;
+  gfx::Insets insets(
+      is_horizontal
+          ? gfx::Insets(0, kHitRegionPadding, 0, hit_region_with_separator)
+          : gfx::Insets(kHitRegionPadding, 0, hit_region_with_separator, 0));
+  if (base::i18n::IsRTL())
+    insets.Set(insets.top(), insets.right(), insets.bottom(), insets.left());
+  SetBorder(views::CreateEmptyBorder(insets));
+
+  int horizontal_margin = main_axis_margin_;
+  int vertical_margin = cross_axis_margin_;
+  if (!is_horizontal)
+    std::swap(horizontal_margin, vertical_margin);
+  views::BoxLayout* layout =
+      new views::BoxLayout(orientation, horizontal_margin, vertical_margin, 0);
+
+  layout->set_minimum_cross_axis_size(kTrayItemSize);
+  views::View::SetLayoutManager(layout);
+
+  PreferredSizeChanged();
+}
+
+}  // namespace ash