Fix status area accessability issues.

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/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
 #include "ash/system/network/network_observer.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/shelf_layout_manager.h"
 #include "base/i18n/time_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "ui/aura/window.h"
+#include "ui/gfx/screen.h"
 
 namespace ash {
 
 namespace {
 
 class DummySystemTrayDelegate : public SystemTrayDelegate {
  public:
   DummySystemTrayDelegate()
       : muted_(false),
         wifi_enabled_(true),
@@ skipping 242 matching lines @@
 };
 
 }  // namespace
 
 namespace internal {
 
 StatusAreaWidget::StatusAreaWidget()
     : status_area_widget_delegate_(new internal::StatusAreaWidgetDelegate),
       system_tray_(NULL),
       web_notification_tray_(NULL),
-      login_status_(user::LOGGED_IN_NONE) {
+      login_status_(user::LOGGED_IN_NONE),
+      should_show_launcher_(false) {
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.delegate = status_area_widget_delegate_;
   params.parent =
       Shell::GetPrimaryRootWindowController()->GetContainer(
           ash::internal::kShellWindowId_StatusContainer);
   params.transparent = true;
   Init(params);
   set_focus_on_creation(false);
   SetContentsView(status_area_widget_delegate_);
   GetNativeView()->SetName("StatusAreaWidget");
 }
 
 StatusAreaWidget::~StatusAreaWidget() {
 }
 
 void StatusAreaWidget::CreateTrayViews(ShellDelegate* shell_delegate) {
+  AddSystemTray(shell_delegate);
   AddWebNotificationTray();
-  AddSystemTray(shell_delegate);
-  // SetBorder() must be called after all trays have been created.
-  web_notification_tray_->SetBorder();
-  system_tray_->SetBorder();
+  // Initialize() must be called after all trays have been created.
+  if (system_tray_) {
+    system_tray_->Initialize();
+    system_tray_->CreateItems();

[sadrul, 2012/08/15 16:47:01]

Maybe CreateItems can be called from Initialize now?

[stevenjb, 2012/08/15 21:51:04]

Done.

+  }
+  if (web_notification_tray_) {
+    web_notification_tray_->Initialize();
+  }
+  if (system_tray_delegate()) {
+    UpdateAfterLoginStatusChange(system_tray_delegate_->GetUserLoginStatus());

[sadrul, 2012/08/15 16:47:01]

Can system_tray_delegate() be NULL here?

[stevenjb, 2012/08/15 21:51:04]

Looks like not, removed test.

+  }
 }
 
 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).
   system_tray_delegate_.reset();
   delete system_tray_;
   system_tray_ = NULL;
   delete web_notification_tray_;
   web_notification_tray_ = NULL;
 }
 
 void StatusAreaWidget::AddSystemTray(ShellDelegate* shell_delegate) {
   system_tray_ = new SystemTray(this);
   status_area_widget_delegate_->AddTray(system_tray_);
-  system_tray_->Initialize();  // Called after added to widget.
 
   if (shell_delegate) {
     system_tray_delegate_.reset(
         shell_delegate->CreateSystemTrayDelegate(system_tray_));
   }
   if (!system_tray_delegate_.get())
     system_tray_delegate_.reset(new DummySystemTrayDelegate());
-
-  system_tray_->CreateItems();  // Called after delegate is created.
-  UpdateAfterLoginStatusChange(system_tray_delegate_->GetUserLoginStatus());
 }
 
 void StatusAreaWidget::AddWebNotificationTray() {
   web_notification_tray_ = new WebNotificationTray(this);
   status_area_widget_delegate_->AddTray(web_notification_tray_);
 }
 
 void StatusAreaWidget::SetShelfAlignment(ShelfAlignment alignment) {
   status_area_widget_delegate_->set_alignment(alignment);
   if (system_tray_)
@@ skipping 30 matching lines @@
     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);
 }
 
+void StatusAreaWidget::UpdateShouldShowLauncher() {
+  bool should_show_launcher =
+      (system_tray_ && system_tray_->IsSystemBubbleVisible()) ||
+      (web_notification_tray_ &&
+       web_notification_tray_->IsMessageCenterBubbleVisible());
+  if (!should_show_launcher && Shell::GetInstance()->shelf()->IsVisible()) {
+    // If the launcher is currently visible, don't hide the launcher
+    // if the mouse is in this widget or in any notification bubbles.
+    should_show_launcher =
+        (GetWindowBoundsInScreen().Contains(
+            gfx::Screen::GetCursorScreenPoint())) ||
+        (system_tray_ && system_tray_->IsMouseInNotificationBubble()) ||
+        (web_notification_tray_ &&
+         web_notification_tray_->IsMouseInNotificationBubble());
+  }
+  if (should_show_launcher != should_show_launcher_) {
+    should_show_launcher_ = should_show_launcher;
+    Shell::GetInstance()->shelf()->UpdateAutoHideState();
+  }
+}
+
 }  // namespace internal
 }  // namespace ash