Make LogoutButtonTray a regular View

ash/system/status_area_widget_delegate.cc

 // 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.
 
 #include "ash/system/status_area_widget_delegate.h"
 
 #include "ash/focus_cycler.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/wm_shelf.h"
-#include "ash/shelf/wm_shelf_util.h"
 #include "ash/shell.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/wm_window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/border.h"
 #include "ui/views/layout/grid_layout.h"
 
@@ skipping 17 matching lines @@
   ~StatusAreaWidgetDelegateAnimationSettings() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StatusAreaWidgetDelegateAnimationSettings);
 };
 
 }  // namespace
 
 namespace ash {
 
-StatusAreaWidgetDelegate::StatusAreaWidgetDelegate()
-    : focus_cycler_for_testing_(nullptr), alignment_(SHELF_ALIGNMENT_BOTTOM) {
+StatusAreaWidgetDelegate::StatusAreaWidgetDelegate(WmShelf* wm_shelf)
+    : wm_shelf_(wm_shelf), focus_cycler_for_testing_(nullptr) {
+  DCHECK(wm_shelf_);
+
   // Allow the launcher to surrender the focus to another window upon
   // navigation completion by the user.
   set_allow_deactivate_on_esc(true);
   SetPaintToLayer();
   layer()->SetFillsBoundsOpaquely(false);
 }
 
 StatusAreaWidgetDelegate::~StatusAreaWidgetDelegate() {}
 
 void StatusAreaWidgetDelegate::SetFocusCyclerForTesting(
@@ skipping 53 matching lines @@
   for (int c = 0; c < child_count(); ++c) {
     views::View* child = child_at(c);
     if (!child->visible())
       continue;
     SetBorderOnChild(child, is_child_on_edge);
     is_child_on_edge = false;
   }
 
   views::ColumnSet* columns = layout->AddColumnSet(0);
 
-  if (IsHorizontalAlignment(alignment_)) {
+  if (wm_shelf_->IsHorizontalAlignment()) {
     for (int c = child_count() - 1; c >= 0; --c) {
       views::View* child = child_at(c);
       if (!child->visible())
         continue;
       columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::FILL,
                          0, /* resize percent */
                          views::GridLayout::USE_PREF, 0, 0);
     }
     layout->StartRow(0, 0);
     for (int c = child_count() - 1; c >= 0; --c) {
@@ skipping 32 matching lines @@
 }
 
 void StatusAreaWidgetDelegate::UpdateWidgetSize() {
   if (GetWidget())
     GetWidget()->SetSize(GetPreferredSize());
 }
 
 void StatusAreaWidgetDelegate::SetBorderOnChild(views::View* child,
                                                 bool extend_border_to_edge) {
   // Tray views are laid out right-to-left or bottom-to-top.
-  const bool horizontal_alignment = IsHorizontalAlignment(alignment_);
+  const bool horizontal_alignment = wm_shelf_->IsHorizontalAlignment();
   const int padding = (kShelfSize - kTrayItemSize) / 2;
 
   const int top_edge = horizontal_alignment ? padding : 0;
   const int left_edge = horizontal_alignment ? 0 : padding;
   const int bottom_edge =
       horizontal_alignment
           ? padding
           : (extend_border_to_edge ? kPaddingFromEdgeOfShelf : 0);
   const int right_edge =
       horizontal_alignment
           ? (extend_border_to_edge ? kPaddingFromEdgeOfShelf : 0)
           : padding;
   child->SetBorder(
       views::CreateEmptyBorder(top_edge, left_edge, bottom_edge, right_edge));
 
   // Layout on |child| needs to be updated based on new border value before
   // displaying; otherwise |child| will be showing with old border size.
   // Fix for crbug.com/623438.
   child->Layout();
 }
 
 }  // namespace ash