Revert 151752 - Move non SystemTray specific code to TrayBackgroundView

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/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_bubble_view.h"
 #include "ash/system/tray/tray_constants.h"
@@ skipping 744 matching lines @@
 
     weak_ptr_factory_.InvalidateWeakPtrs();  // Cancel any pending update.
     MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&WebNotificationTray::Bubble::UpdateBubbleView,
                    weak_ptr_factory_.GetWeakPtr()),
         base::TimeDelta::FromMilliseconds(kUpdateDelayMs));
   }
 
   views::Widget* bubble_widget() const { return bubble_widget_; }
-  TrayBubbleView* bubble_view() const { return bubble_view_; }
 
   // Overridden from TrayBubbleView::Host.
   virtual void BubbleViewDestroyed() OVERRIDE {
     bubble_view_ = NULL;
     contents_view_ = NULL;
   }
 
   virtual void OnMouseEnteredView() OVERRIDE {
     StopAutoCloseTimer();
   }
@@ skipping 184 matching lines @@
   internal::TrayBackgroundView::SetShelfAlignment(alignment);
   if (alignment == SHELF_ALIGNMENT_BOTTOM)
     tray_container()->set_size(gfx::Size(kTrayWidth, kTrayHeight));
   else
     tray_container()->set_size(gfx::Size(kTraySideWidth, kTraySideHeight));
   // Destroy any existing bubble so that it will be rebuilt correctly.
   HideMessageCenterBubble();
   HideNotificationBubble();
 }
 
-void WebNotificationTray::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 (message_center_bubble_.get())
-    message_center_bubble_->bubble_view()->UpdateBubble();
-}
-
 // Protected methods (invoked only from Bubble and its child classes)
 
 void WebNotificationTray::SendRemoveNotification(const std::string& id) {
   // If this is the only notification in the list, close the bubble.
   if (notification_list_->notifications().size() == 1 &&
       id == notification_list_->GetFirstId()) {
     HideMessageCenterBubble();
   }
   if (delegate_)
     delegate_->NotificationRemoved(id);
@@ skipping 55 matching lines @@
 
 // Private methods
 
 void WebNotificationTray::UpdateTray() {
   count_label_->SetText(UTF8ToUTF16(
       GetNotificationText(notification_list()->unread_count())));
   // Dim the message count text only if the message center is empty.
   count_label_->SetEnabledColor(
       (notification_list()->notifications().size() == 0) ?
       kMessageCountDimmedColor : kMessageCountColor);
-  bool is_visible =
-      (status_area_widget()->login_status() != user::LOGGED_IN_NONE) &&
-      (status_area_widget()->login_status() != user::LOGGED_IN_LOCKED);
-  SetVisible(is_visible);
+  SetVisible((status_area_widget()->login_status() != user::LOGGED_IN_NONE));
   Layout();
   SchedulePaint();
 }
 
 void WebNotificationTray::UpdateTrayAndBubble() {
   UpdateTray();
 
   if (message_center_bubble())
     message_center_bubble()->ScheduleUpdate();
 
@@ skipping 11 matching lines @@
   } else if (bubble == notification_bubble()) {
     HideNotificationBubble();
   }
 }
 
 bool WebNotificationTray::HasNotificationForTest(const std::string& id) const {
   return notification_list_->HasNotification(id);
 }
 
 }  // namespace ash