Revert 151752 - Move non SystemTray specific code to TrayBackgroundView

ash/system/tray/system_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/tray/system_tray.h"
 
 #include "ash/shell.h"
 #include "ash/shell/panel_window.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/tray_volume.h"
@@ skipping 33 matching lines @@
 #include "ui/gfx/screen.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 
 namespace ash {
 
+namespace internal {
+
+// Observe the tray layer animation and update the anchor when it changes.
+// TODO(stevenjb): Observe or mirror the actual animation, not just the start
+// and end points.
+class SystemTrayLayerAnimationObserver : public ui::LayerAnimationObserver {
+ public:
+  explicit SystemTrayLayerAnimationObserver(SystemTray* host) : host_(host) {}
+
+  virtual void OnLayerAnimationEnded(ui::LayerAnimationSequence* sequence) {
+    host_->UpdateNotificationAnchor();
+  }
+
+  virtual void OnLayerAnimationAborted(ui::LayerAnimationSequence* sequence) {
+    host_->UpdateNotificationAnchor();
+  }
+
+  virtual void OnLayerAnimationScheduled(ui::LayerAnimationSequence* sequence) {
+    host_->UpdateNotificationAnchor();
+  }
+
+ private:
+  SystemTray* host_;
+
+  DISALLOW_COPY_AND_ASSIGN(SystemTrayLayerAnimationObserver);
+};
+
+}  // namespace internal
+
 // SystemTray
 
 using internal::SystemTrayBubble;
+using internal::SystemTrayLayerAnimationObserver;
 using internal::TrayBubbleView;
 
 SystemTray::SystemTray(internal::StatusAreaWidget* status_area_widget)
     : internal::TrayBackgroundView(status_area_widget),
       items_(),
       accessibility_observer_(NULL),
       audio_observer_(NULL),
       bluetooth_observer_(NULL),
       brightness_observer_(NULL),
       caps_lock_observer_(NULL),
       clock_observer_(NULL),
       drive_observer_(NULL),
       ime_observer_(NULL),
       locale_observer_(NULL),
       network_observer_(NULL),
       update_observer_(NULL),
       user_observer_(NULL),
       should_show_launcher_(false),
       default_bubble_height_(0),
       hide_notifications_(false) {
 }
 
 SystemTray::~SystemTray() {
   bubble_.reset();
   for (std::vector<SystemTrayItem*>::iterator it = items_.begin();
        it != items_.end();
        ++it) {
     (*it)->DestroyTrayView();
   }
+  GetWidget()->GetNativeView()->layer()->GetAnimator()->RemoveObserver(
+      layer_animation_observer_.get());
+}
+
+void SystemTray::Initialize() {
+  layer_animation_observer_.reset(new SystemTrayLayerAnimationObserver(this));
+  GetWidget()->GetNativeView()->layer()->GetAnimator()->AddObserver(
+      layer_animation_observer_.get());
 }
 
 void SystemTray::CreateItems() {
   internal::TrayVolume* tray_volume = new internal::TrayVolume();
   internal::TrayBluetooth* tray_bluetooth = new internal::TrayBluetooth();
   internal::TrayBrightness* tray_brightness = new internal::TrayBrightness();
   internal::TrayDate* tray_date = new internal::TrayDate();
   internal::TrayPower* tray_power = new internal::TrayPower();
   internal::TrayNetwork* tray_network = new internal::TrayNetwork;
   internal::TraySms* tray_sms = new internal::TraySms();
@@ skipping 40 matching lines @@
   AddTrayItem(tray_date);
   SetVisible(ash::Shell::GetInstance()->tray_delegate()->
       GetTrayVisibilityOnStartup());
 }
 
 void SystemTray::AddTrayItem(SystemTrayItem* item) {
   items_.push_back(item);
 
   SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
   views::View* tray_item = item->CreateTrayView(delegate->GetUserLoginStatus());
-  item->UpdateAfterShelfAlignmentChange(shelf_alignment());
+  item->UpdateAfterShelfAlignmentChange(
+      ash::Shell::GetInstance()->system_tray()->shelf_alignment());
 
   if (tray_item) {
     tray_container()->AddChildViewAt(tray_item, 0);
     PreferredSizeChanged();
     tray_item_map_[item] = tray_item;
   }
 }
 
 void SystemTray::RemoveTrayItem(SystemTrayItem* item) {
   NOTIMPLEMENTED();
@@ skipping 232 matching lines @@
   init_params.arrow_color = kBackgroundColor;
   user::LoginStatus login_status =
       Shell::GetInstance()->tray_delegate()->GetUserLoginStatus();
   notification_bubble_->InitView(anchor, init_params, login_status);
   if (hide_notifications_)
     notification_bubble_->SetVisible(false);
   else
     status_area_widget()->HideNonSystemNotifications();
 }
 
-void SystemTray::Initialize() {
-  internal::TrayBackgroundView::Initialize();
-  CreateItems();
+void SystemTray::UpdateNotificationAnchor() {
+  if (!notification_bubble_.get())
+    return;
+  notification_bubble_->bubble_view()->UpdateBubble();
+  // Ensure that the notification buble is above the launcher/status area.
+  notification_bubble_->bubble_view()->GetWidget()->StackAtTop();
 }
 
 void SystemTray::SetShelfAlignment(ShelfAlignment alignment) {
   if (alignment == shelf_alignment())
     return;
   internal::TrayBackgroundView::SetShelfAlignment(alignment);
   UpdateAfterShelfAlignmentChange(alignment);
   // Destroy any existing bubble so that it is rebuilt correctly.
   bubble_.reset();
   // Rebuild any notification bubble.
   if (notification_bubble_.get()) {
     notification_bubble_.reset();
     UpdateNotificationBubble();
   }
 }
 
-void SystemTray::AnchorUpdated() {
-  if (notification_bubble_.get()) {
-    notification_bubble_->bubble_view()->UpdateBubble();
-    // Ensure that the notification buble is above the launcher/status area.
-    notification_bubble_->bubble_view()->GetWidget()->StackAtTop();
-  }
-  if (bubble_.get())
-    bubble_->bubble_view()->UpdateBubble();
-}
-
 bool SystemTray::PerformAction(const ui::Event& event) {
   // If we're already showing the default view, hide it; otherwise, show it
   // (and hide any popup that's currently shown).
   if (bubble_.get() &&
       bubble_->bubble_type() == SystemTrayBubble::BUBBLE_TYPE_DEFAULT) {
     bubble_->Close();
   } else {
     int arrow_offset = TrayBubbleView::InitParams::kArrowDefaultOffset;
     if (event.IsMouseEvent() || event.type() == ui::ET_GESTURE_TAP) {
       const ui::LocatedEvent& located_event =
@@ skipping 14 matching lines @@
   should_show_launcher_ = true;
 }
 
 void SystemTray::OnMouseExited(const ui::MouseEvent& event) {
   TrayBackgroundView::OnMouseExited(event);
   // When the popup closes we'll update |should_show_launcher_|.
   if (!bubble_.get())
     should_show_launcher_ = false;
 }
 
+void SystemTray::AboutToRequestFocusFromTabTraversal(bool reverse) {
+  views::View* v = GetNextFocusableView();
+  if (v)
+    v->AboutToRequestFocusFromTabTraversal(reverse);
+}
+
 void SystemTray::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
   state->name = l10n_util::GetStringUTF16(
       IDS_ASH_STATUS_TRAY_ACCESSIBLE_NAME);
 }
 
+void SystemTray::OnPaintFocusBorder(gfx::Canvas* canvas) {
+  // The tray itself expands to the right and bottom edge of the screen to make
+  // sure clicking on the edges brings up the popup. However, the focus border
+  // should be only around the container.
+  if (GetWidget() && GetWidget()->IsActive())
+    DrawBorder(canvas, GetContentsBounds());
+}
+
 }  // namespace ash