Make LogoutButtonTray a regular View

ash/system/status_area_widget.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.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
 #include "ash/system/ime_menu/ime_menu_tray.h"
 #include "ash/system/overview/overview_button_tray.h"
 #include "ash/system/palette/palette_tray.h"
 #include "ash/system/palette/palette_utils.h"
 #include "ash/system/session/logout_button_tray.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/virtual_keyboard/virtual_keyboard_tray.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "ash/wm_window.h"
 #include "base/i18n/time_formatting.h"
 #include "ui/display/display.h"
 #include "ui/native_theme/native_theme_dark_aura.h"
 
 namespace ash {
 
 StatusAreaWidget::StatusAreaWidget(WmWindow* status_container,
                                    WmShelf* wm_shelf)
-    : status_area_widget_delegate_(new StatusAreaWidgetDelegate),
+    : status_area_widget_delegate_(new StatusAreaWidgetDelegate(wm_shelf)),
       overview_button_tray_(nullptr),
       system_tray_(nullptr),
       web_notification_tray_(nullptr),
       logout_button_tray_(nullptr),
       palette_tray_(nullptr),
       virtual_keyboard_tray_(nullptr),
       ime_menu_tray_(nullptr),
       login_status_(LoginStatus::NOT_LOGGED_IN),
       wm_shelf_(wm_shelf) {
   views::Widget::InitParams params(
@@ skipping 18 matching lines @@
   AddPaletteTray();
   AddVirtualKeyboardTray();
   AddImeMenuTray();
   AddLogoutButtonTray();
 
   SystemTrayDelegate* delegate = Shell::Get()->system_tray_delegate();
   DCHECK(delegate);
   // Initialize after all trays have been created.
   system_tray_->InitializeTrayItems(delegate, web_notification_tray_);
   web_notification_tray_->Initialize();
-  logout_button_tray_->Initialize();
   if (palette_tray_)
     palette_tray_->Initialize();
   virtual_keyboard_tray_->Initialize();
   ime_menu_tray_->Initialize();
   overview_button_tray_->Initialize();
-  SetShelfAlignment(system_tray_->shelf_alignment());
+  UpdateAfterShelfAlignmentChange();
   UpdateAfterLoginStatusChange(delegate->GetUserLoginStatus());
 }
 
 void StatusAreaWidget::Shutdown() {
   system_tray_->Shutdown();
   // Destroy the trays early, causing them to be removed from the view
   // hierarchy. Do not used scoped pointers since we don't want to destroy them
   // in the destructor if Shutdown() is not called (e.g. in tests).
   // Failure to remove the tray views causes layout crashes during shutdown,
   // for example http://crbug.com/700122.
@@ skipping 11 matching lines @@
   delete palette_tray_;
   palette_tray_ = nullptr;
   delete logout_button_tray_;
   logout_button_tray_ = nullptr;
   delete overview_button_tray_;
   overview_button_tray_ = nullptr;
   // All child tray views have been removed.
   DCHECK_EQ(0, GetContentsView()->child_count());
 }
 
-void StatusAreaWidget::SetShelfAlignment(ShelfAlignment alignment) {
-  status_area_widget_delegate_->set_alignment(alignment);
+void StatusAreaWidget::UpdateAfterShelfAlignmentChange() {
   if (system_tray_)
-    system_tray_->SetShelfAlignment(alignment);
+    system_tray_->UpdateAfterShelfAlignmentChange();
   if (web_notification_tray_)
-    web_notification_tray_->SetShelfAlignment(alignment);
+    web_notification_tray_->UpdateAfterShelfAlignmentChange();
   if (logout_button_tray_)
-    logout_button_tray_->SetShelfAlignment(alignment);
+    logout_button_tray_->UpdateAfterShelfAlignmentChange();
   if (virtual_keyboard_tray_)
-    virtual_keyboard_tray_->SetShelfAlignment(alignment);
+    virtual_keyboard_tray_->UpdateAfterShelfAlignmentChange();
   if (ime_menu_tray_)
-    ime_menu_tray_->SetShelfAlignment(alignment);
+    ime_menu_tray_->UpdateAfterShelfAlignmentChange();
   if (palette_tray_)
-    palette_tray_->SetShelfAlignment(alignment);
+    palette_tray_->UpdateAfterShelfAlignmentChange();
   if (overview_button_tray_)
-    overview_button_tray_->SetShelfAlignment(alignment);
+    overview_button_tray_->UpdateAfterShelfAlignmentChange();
   status_area_widget_delegate_->UpdateLayout();
 }
 
 void StatusAreaWidget::UpdateAfterLoginStatusChange(LoginStatus login_status) {
   if (login_status_ == login_status)
     return;
   login_status_ = login_status;
   if (system_tray_)
     system_tray_->UpdateAfterLoginStatusChange(login_status);
   if (web_notification_tray_)
     web_notification_tray_->UpdateAfterLoginStatusChange(login_status);
   if (logout_button_tray_)
-    logout_button_tray_->UpdateAfterLoginStatusChange(login_status);
+    logout_button_tray_->UpdateAfterLoginStatusChange();
   if (overview_button_tray_)
     overview_button_tray_->UpdateAfterLoginStatusChange(login_status);
 }
 
 bool StatusAreaWidget::ShouldShowShelf() const {
   if ((system_tray_ && system_tray_->ShouldShowShelf()) ||
       (web_notification_tray_ &&
        web_notification_tray_->ShouldBlockShelfAutoHide()))
     return true;
 
@@ skipping 31 matching lines @@
 void StatusAreaWidget::OnNativeWidgetActivationChanged(bool active) {
   Widget::OnNativeWidgetActivationChanged(active);
   if (active)
     status_area_widget_delegate_->SetPaneFocusAndFocusDefault();
 }
 
 void StatusAreaWidget::UpdateShelfItemBackground(SkColor color) {
   web_notification_tray_->UpdateShelfItemBackground(color);
   system_tray_->UpdateShelfItemBackground(color);
   virtual_keyboard_tray_->UpdateShelfItemBackground(color);
-  logout_button_tray_->UpdateShelfItemBackground(color);
   ime_menu_tray_->UpdateShelfItemBackground(color);
   if (palette_tray_)
     palette_tray_->UpdateShelfItemBackground(color);
   overview_button_tray_->UpdateShelfItemBackground(color);
 }
 
 void StatusAreaWidget::AddSystemTray() {
   system_tray_ = new SystemTray(wm_shelf_);
   status_area_widget_delegate_->AddTray(system_tray_);
 }
@@ skipping 32 matching lines @@
   ime_menu_tray_ = new ImeMenuTray(wm_shelf_);
   status_area_widget_delegate_->AddTray(ime_menu_tray_);
 }
 
 void StatusAreaWidget::AddOverviewButtonTray() {
   overview_button_tray_ = new OverviewButtonTray(wm_shelf_);
   status_area_widget_delegate_->AddTray(overview_button_tray_);
 }
 
 }  // namespace ash