Make LogoutButtonTray a regular View

ash/system/web_notification/web_notification_tray.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/web_notification/web_notification_tray.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_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/strings/grit/ash_strings.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_bubble_wrapper.h"
 #include "ash/system/tray/tray_constants.h"
+#include "ash/system/tray/tray_container.h"

[James Cook, 2017/04/17 16:54:35]

Is this needed?

[mohsen, 2017/04/19 22:59:07]

Yes, this file works with TrayBackgroundView::tray_container() which is
forward-declared in tray_background_view.h. Previously, the full declaration was
in tray_background_view.h.

 #include "ash/system/tray/tray_utils.h"
 #include "ash/system/web_notification/ash_popup_alignment_delegate.h"
 #include "ash/wm_shell.h"
 #include "ash/wm_window.h"
 #include "base/auto_reset.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 127 matching lines @@
  protected:
   // Overridden from views::View:
   gfx::Size GetPreferredSize() const override {
     if (!animation_.get() || !animation_->is_animating())
       return kTrayItemOuterSize;
 
     // Animate the width (or height) when this item shows (or hides) so that
     // the icons on the left are shifted with the animation.
     // Note that TrayItemView does the same thing.
     gfx::Size size = kTrayItemOuterSize;
-    if (IsHorizontalLayout()) {
+    if (tray_->shelf()->IsHorizontalAlignment()) {
       size.set_width(std::max(
           1, gfx::ToRoundedInt(size.width() * animation_->GetCurrentValue())));
     } else {
       size.set_height(std::max(
           1, gfx::ToRoundedInt(size.height() * animation_->GetCurrentValue())));
     }
     return size;
   }
 
   int GetHeightForWidth(int width) const override {
     return GetPreferredSize().height();
   }
 
-  bool IsHorizontalLayout() const {
-    return IsHorizontalAlignment(tray_->shelf_alignment());
-  }
-
  private:
   // gfx::AnimationDelegate:
   void AnimationProgressed(const gfx::Animation* animation) override {
     gfx::Transform transform;
-    if (IsHorizontalLayout()) {
+    if (tray_->shelf()->IsHorizontalAlignment()) {
       transform.Translate(0, animation->CurrentValueBetween(
                                  static_cast<double>(height()) / 2., 0.));
     } else {
       transform.Translate(
           animation->CurrentValueBetween(static_cast<double>(width() / 2.), 0.),
           0);
     }
     transform.Scale(animation->GetCurrentValue(), animation->GetCurrentValue());
     layer()->SetTransform(transform);
     PreferredSizeChanged();
@@ skipping 66 matching lines @@
 
  private:
   views::Label* view_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationLabel);
 };
 
 WebNotificationTray::WebNotificationTray(WmShelf* shelf,
                                          WmWindow* status_area_window,
                                          SystemTray* system_tray)
-    : TrayBackgroundView(shelf, true),
+    : TrayBackgroundView(shelf),
       status_area_window_(status_area_window),
       system_tray_(system_tray),
       show_message_center_on_unlock_(false),
       should_update_tray_content_(false),
       should_block_shelf_auto_hide_(false) {
   DCHECK(shelf);
   DCHECK(status_area_window_);
   DCHECK(system_tray_);
 
   SetInkDropMode(InkDropMode::ON);
@@ skipping 39 matching lines @@
   if (!ShouldShowMessageCenter())
     return false;
 
   should_block_shelf_auto_hide_ = true;
   message_center::MessageCenterBubble* message_center_bubble =
       new message_center::MessageCenterBubble(message_center(),
                                               message_center_tray_.get());
 
   // In the horizontal case, message center starts from the top of the shelf.
   // In the vertical case, it starts from the bottom of WebNotificationTray.
-  const int max_height = IsHorizontalAlignment(shelf_alignment())
+  const int max_height = shelf()->IsHorizontalAlignment()
                              ? shelf()->GetIdealBounds().y()
                              : GetBoundsInScreen().bottom();
   message_center_bubble->SetMaxHeight(max_height);
 
   if (show_settings)
     message_center_bubble->SetSettingsVisible();
 
   // For vertical shelf alignments, anchor to the WebNotificationTray, but for
   // horizontal (i.e. bottom) shelves, anchor to the system tray.
   TrayBackgroundView* anchor_tray = this;
-  if (IsHorizontalAlignment(shelf_alignment())) {
+  if (shelf()->IsHorizontalAlignment()) {
     anchor_tray = WmShelf::ForWindow(status_area_window_)
                       ->GetStatusAreaWidget()
                       ->system_tray();
   }
 
   message_center_bubble_.reset(new WebNotificationBubbleWrapper(
       this, anchor_tray, message_center_bubble));
 
   shelf()->UpdateAutoHideState();
   SetIsActive(true);
@@ skipping 54 matching lines @@
   if (!IsMessageCenterBubbleVisible())
     message_center_tray_->ShowMessageCenterBubble();
 }
 
 void WebNotificationTray::UpdateAfterLoginStatusChange(
     LoginStatus login_status) {
   message_center()->SetLockedState(login_status == LoginStatus::LOCKED);
   OnMessageCenterTrayChanged();
 }
 
-void WebNotificationTray::SetShelfAlignment(ShelfAlignment alignment) {
-  if (alignment == shelf_alignment())
-    return;
-  TrayBackgroundView::SetShelfAlignment(alignment);
+void WebNotificationTray::UpdateAfterShelfAlignmentChange() {
+  TrayBackgroundView::UpdateAfterShelfAlignmentChange();
   // Destroy any existing bubble so that it will be rebuilt correctly.
   message_center_tray_->HideMessageCenterBubble();
   message_center_tray_->HidePopupBubble();
 }
 
 void WebNotificationTray::AnchorUpdated() {
   if (message_center_bubble()) {
     message_center_bubble()->bubble_view()->UpdateBubble();
     UpdateBubbleViewArrow(message_center_bubble()->bubble_view());
   }
@@ skipping 190 matching lines @@
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return nullptr;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash