Re-factor Ash Message Center code part 2/4

ash/system/web_notification/popup_bubble.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/popup_bubble.h"
 
 #include "ash/system/tray/tray_bubble_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/web_notification/web_notification_list.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "ash/system/web_notification/web_notification_view.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
-using internal::TrayBubbleView;
-
 namespace message_center {
 
 const int kAutocloseDelaySeconds = 5;
 
 // Popup notifications contents.
 class PopupBubbleContentsView : public views::View {
  public:
   explicit PopupBubbleContentsView(WebNotificationTray* tray)
       : tray_(tray) {
     SetLayoutManager(
@@ skipping 39 matching lines @@
 PopupBubble::PopupBubble(WebNotificationTray* tray) :
     WebNotificationBubble(tray),
     contents_view_(NULL),
     num_popups_(0),
     dirty_(false) {
   TrayBubbleView::InitParams init_params = GetInitParams();
   init_params.top_color = kBackgroundColor;
   init_params.arrow_color = kBackgroundColor;
   init_params.close_on_deactivate = false;
   views::View* anchor = tray_->tray_container();
-  bubble_view_ = TrayBubbleView::Create(anchor, this, init_params);
+  bubble_view_ = TrayBubbleView::Create(
+      tray_->GetBubbleWindowContainer(), anchor, this, &init_params);
   contents_view_ = new PopupBubbleContentsView(tray);
 
   Initialize(contents_view_);
 }
 
 PopupBubble::~PopupBubble() {}
 
 size_t PopupBubble::NumMessageViewsForTest() const {
   return contents_view_->NumMessageViewsForTest();
 }
@@ skipping 10 matching lines @@
 
 void PopupBubble::OnMouseExitedView() {
   StartAutoCloseTimer();
   WebNotificationBubble::OnMouseExitedView();
 }
 
 void PopupBubble::UpdateBubbleView() {
   WebNotificationList::Notifications popup_notifications;
   tray_->notification_list()->GetPopupNotifications(&popup_notifications);
   if (popup_notifications.size() == 0) {
-    tray_->HideBubble(this);  // deletes |this|!
+    tray_->HideBubbleWithView(bubble_view());  // deletes |this|
     return;
   }
   // Only update the popup tray if the number of visible popup notifications
   // has changed.
   if (popup_notifications.size() != num_popups_ || dirty()) {
     set_dirty(false);
     num_popups_ = popup_notifications.size();
     contents_view_->Update(popup_notifications);
     bubble_view_->Show();
     bubble_view_->UpdateBubble();
@@ skipping 14 matching lines @@
 
 void PopupBubble::OnAutoClose() {
   tray_->notification_list()->MarkPopupsAsShown();
   num_popups_ = 0;
   UpdateBubbleView();
 }
 
 }  // namespace message_center
 
 }  // namespace ash