Attempting to reland the Overview Button Change.

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/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
+#include "ash/system/overview/overview_button_tray.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/web_notification/web_notification_tray.h"
 #include "ash/wm/window_properties.h"
 #include "base/i18n/time_formatting.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/screen.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h"
 #endif
 
 namespace ash {
 
 namespace internal {
 
 const char StatusAreaWidget::kNativeViewName[] = "StatusAreaWidget";
 
 StatusAreaWidget::StatusAreaWidget(aura::Window* status_container)
     : status_area_widget_delegate_(new internal::StatusAreaWidgetDelegate),
+      overview_button_tray_(NULL),
       system_tray_(NULL),
       web_notification_tray_(NULL),
       logout_button_tray_(NULL),
 #if defined(OS_CHROMEOS)
       virtual_keyboard_tray_(NULL),
 #endif
       login_status_(user::LOGGED_IN_NONE) {
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.delegate = status_area_widget_delegate_;
   params.parent = status_container;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   Init(params);
   set_focus_on_creation(false);
   SetContentsView(status_area_widget_delegate_);
   GetNativeView()->SetName(kNativeViewName);
 }
 
 StatusAreaWidget::~StatusAreaWidget() {
 }
 
 void StatusAreaWidget::CreateTrayViews() {
+  AddOverviewButtonTray();
   AddSystemTray();
   AddWebNotificationTray();
   AddLogoutButtonTray();
 #if defined(OS_CHROMEOS)
   AddVirtualKeyboardTray();
 #endif
+
   SystemTrayDelegate* delegate =
       ash::Shell::GetInstance()->system_tray_delegate();
   DCHECK(delegate);
   // Initialize after all trays have been created.
-  if (system_tray_)
-    system_tray_->InitializeTrayItems(delegate);
-  if (web_notification_tray_)
-    web_notification_tray_->Initialize();
-  if (logout_button_tray_)
-    logout_button_tray_->Initialize();
+  system_tray_->InitializeTrayItems(delegate);
+  web_notification_tray_->Initialize();
+  logout_button_tray_->Initialize();
 #if defined(OS_CHROMEOS)
-  if (virtual_keyboard_tray_)
-    virtual_keyboard_tray_->Initialize();
+  virtual_keyboard_tray_->Initialize();
 #endif
+  overview_button_tray_->Initialize();
   UpdateAfterLoginStatusChange(delegate->GetUserLoginStatus());
 }
 
 void StatusAreaWidget::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).
   delete logout_button_tray_;
   logout_button_tray_ = NULL;
   delete web_notification_tray_;
   web_notification_tray_ = NULL;
   delete system_tray_;
   system_tray_ = NULL;
 #if defined(OS_CHROMEOS)
   delete virtual_keyboard_tray_;
   virtual_keyboard_tray_ = NULL;
 #endif
+  delete overview_button_tray_;
+  overview_button_tray_ = NULL;
 }
 
 bool StatusAreaWidget::ShouldShowShelf() const {
   if ((system_tray_ && system_tray_->ShouldShowShelf()) ||
       (web_notification_tray_ &&
        web_notification_tray_->ShouldBlockShelfAutoHide()))
     return true;
 
   if (!RootWindowController::ForShelf(GetNativeView())->shelf()->IsVisible())
     return false;
 
   // If the shelf is currently visible, don't hide the shelf if the mouse
   // is in any of the notification bubbles.
   return (system_tray_ && system_tray_->IsMouseInNotificationBubble()) ||
-        (web_notification_tray_ &&
-         web_notification_tray_->IsMouseInNotificationBubble());
+         (web_notification_tray_ &&
+          web_notification_tray_->IsMouseInNotificationBubble());
 }
 
 bool StatusAreaWidget::IsMessageBubbleShown() const {
   return ((system_tray_ && system_tray_->IsAnyBubbleVisible()) ||
           (web_notification_tray_ &&
            web_notification_tray_->IsMessageCenterBubbleVisible()));
 }
 
 void StatusAreaWidget::OnNativeWidgetActivationChanged(bool active) {
   Widget::OnNativeWidgetActivationChanged(active);
@@ skipping 16 matching lines @@
   status_area_widget_delegate_->AddTray(logout_button_tray_);
 }
 
 #if defined(OS_CHROMEOS)
 void StatusAreaWidget::AddVirtualKeyboardTray() {
   virtual_keyboard_tray_ = new VirtualKeyboardTray(this);
   status_area_widget_delegate_->AddTray(virtual_keyboard_tray_);
 }
 #endif
 
+void StatusAreaWidget::AddOverviewButtonTray() {
+  overview_button_tray_ = new OverviewButtonTray(this);
+  status_area_widget_delegate_->AddTray(overview_button_tray_);
+}
+
 void StatusAreaWidget::SetShelfAlignment(ShelfAlignment alignment) {
   status_area_widget_delegate_->set_alignment(alignment);
   if (system_tray_)
     system_tray_->SetShelfAlignment(alignment);
   if (web_notification_tray_)
     web_notification_tray_->SetShelfAlignment(alignment);
   if (logout_button_tray_)
     logout_button_tray_->SetShelfAlignment(alignment);
 #if defined(OS_CHROMEOS)
   if (virtual_keyboard_tray_)
     virtual_keyboard_tray_->SetShelfAlignment(alignment);
 #endif
+  if (overview_button_tray_)
+    overview_button_tray_->SetShelfAlignment(alignment);
   status_area_widget_delegate_->UpdateLayout();
 }
 
 void StatusAreaWidget::SetHideSystemNotifications(bool hide) {
   if (system_tray_)
     system_tray_->SetHideNotifications(hide);
 }
 
 void StatusAreaWidget::UpdateAfterLoginStatusChange(
     user::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);
 }
 
 }  // namespace internal
 }  // namespace ash