Move ash/system/web_notification message_center to ui/

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/shell.h"
 #include "ash/system/status_area_widget.h"
-#include "ash/system/tray/tray_bubble_view.h"
 #include "ash/system/tray/tray_bubble_wrapper.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
-#include "ash/system/web_notification/message_center_bubble.h"
-#include "ash/system/web_notification/popup_bubble.h"
-#include "ash/system/web_notification/web_notification.h"
-#include "ash/system/web_notification/web_notification_bubble.h"
+#include "ui/message_center/message_center_bubble.h"
+#include "ui/message_center/message_popup_bubble.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/bubble/tray_bubble_view.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace {
 
 // Tray constants
 const int kTrayContainerVerticalPaddingBottomAlignment = 3;
 const int kTrayContainerHorizontalPaddingBottomAlignment = 1;
 const int kTrayContainerVerticalPaddingVerticalAlignment = 1;
 const int kTrayContainerHorizontalPaddingVerticalAlignment = 0;
 const int kPaddingFromLeftEdgeOfSystemTrayBottomAlignment = 8;
 const int kPaddingFromTopEdgeOfSystemTrayVerticalAlignment = 10;
 
 }  // namespace
 
-using message_center::MessageCenterBubble;
-using message_center::PopupBubble;
-using message_center::TrayBubbleView;
-using message_center::WebNotification;
-using message_center::WebNotificationBubble;
-
 namespace ash {
 
 namespace internal {
 
 // Class to initialize and manage the WebNotificationBubble and
 // TrayBubbleWrapper instances for a bubble.
 
 class WebNotificationBubbleWrapper {
  public:
   // Takes ownership of |bubble| and creates |bubble_wrapper_|.
   WebNotificationBubbleWrapper(WebNotificationTray* tray,
-                               WebNotificationBubble* bubble) {
+                               message_center::MessageBubbleBase* bubble) {
     bubble_.reset(bubble);
-    TrayBubbleView::AnchorAlignment anchor_alignment =
+    views::TrayBubbleView::AnchorAlignment anchor_alignment =
         tray->GetAnchorAlignment();
-    TrayBubbleView::InitParams init_params =
+    views::TrayBubbleView::InitParams init_params =
         bubble->GetInitParams(anchor_alignment);
     views::View* anchor = tray->tray_container();
-    if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_BOTTOM) {
+    if (anchor_alignment == views::TrayBubbleView::ANCHOR_ALIGNMENT_BOTTOM) {
       gfx::Point bounds(anchor->width() / 2, 0);
       views::View::ConvertPointToWidget(anchor, &bounds);
       init_params.arrow_offset = bounds.x();
     }
-    TrayBubbleView* bubble_view = TrayBubbleView::Create(
+    views::TrayBubbleView* bubble_view = views::TrayBubbleView::Create(
         tray->GetBubbleWindowContainer(), anchor, tray, &init_params);
     bubble_wrapper_.reset(new TrayBubbleWrapper(tray, bubble_view));
     bubble->InitializeContents(bubble_view);
   }
 
-  WebNotificationBubble* bubble() const { return bubble_.get(); }
+  message_center::MessageBubbleBase* bubble() const { return bubble_.get(); }
 
   // Convenience accessors.
-  TrayBubbleView* bubble_view() const { return bubble_->bubble_view(); }
+  views::TrayBubbleView* bubble_view() const { return bubble_->bubble_view(); }
 
  private:
-  scoped_ptr<WebNotificationBubble> bubble_;
+  scoped_ptr<message_center::MessageBubbleBase> bubble_;
   scoped_ptr<internal::TrayBubbleWrapper> bubble_wrapper_;
 };
 
 }  // namespace internal
 
 WebNotificationTray::WebNotificationTray(
     internal::StatusAreaWidget* status_area_widget)
     : internal::TrayBackgroundView(status_area_widget),
       button_(NULL),
       show_message_center_on_unlock_(false) {
@@ skipping 15 matching lines @@
   if (status_area_widget()->login_status() == user::LOGGED_IN_LOCKED)
     return;
   if (message_center_bubble()) {
     UpdateTray();
     return;
   }
   // Indicate that the message center is visible. Clears the unread count.
   message_center_->SetMessageCenterVisible(true);
   UpdateTray();
   HidePopupBubble();
-  MessageCenterBubble* bubble = new MessageCenterBubble(message_center_.get());
+  message_center::MessageCenterBubble* bubble =
+      new message_center::MessageCenterBubble(message_center_.get());
   message_center_bubble_.reset(
       new internal::WebNotificationBubbleWrapper(this, bubble));
 
   status_area_widget()->SetHideSystemNotifications(true);
   GetShelfLayoutManager()->UpdateAutoHideState();
 }
 
 void WebNotificationTray::HideMessageCenterBubble() {
   if (!message_center_bubble())
     return;
@@ skipping 18 matching lines @@
   if (message_center_bubble())
     return;
   if (!status_area_widget()->ShouldShowWebNotifications())
     return;
   UpdateTray();
   if (popup_bubble()) {
     popup_bubble()->bubble()->ScheduleUpdate();
   } else if (message_center_->HasPopupNotifications()) {
     popup_bubble_.reset(
         new internal::WebNotificationBubbleWrapper(
-            this, new PopupBubble(message_center_.get())));
+            this, new message_center::MessagePopupBubble(
+                message_center_.get())));
   }
 }
 
 void WebNotificationTray::HidePopupBubble() {
   popup_bubble_.reset();
 }
 
 void WebNotificationTray::UpdateAfterLoginStatusChange(
     user::LoginStatus login_status) {
   if (login_status == user::LOGGED_IN_LOCKED) {
@@ skipping 29 matching lines @@
   // Destroy any existing bubble so that it will be rebuilt correctly.
   HideMessageCenterBubble();
   HidePopupBubble();
 }
 
 void WebNotificationTray::AnchorUpdated() {
   if (popup_bubble_.get()) {
     popup_bubble_->bubble_view()->UpdateBubble();
     // Ensure that the notification buble is above the launcher/status area.
     popup_bubble_->bubble_view()->GetWidget()->StackAtTop();
+    UpdateBubbleViewArrow(popup_bubble_->bubble_view());
   }
-  if (message_center_bubble_.get())
+  if (message_center_bubble_.get()) {
     message_center_bubble_->bubble_view()->UpdateBubble();
+    UpdateBubbleViewArrow(message_center_bubble_->bubble_view());
+  }
 }
 
 string16 WebNotificationTray::GetAccessibleNameForTray() {
   return l10n_util::GetStringUTF16(
       IDS_ASH_WEB_NOTIFICATION_TRAY_ACCESSIBLE_NAME);
 }
 
 void WebNotificationTray::HideBubbleWithView(
-    const TrayBubbleView* bubble_view) {
+    const views::TrayBubbleView* bubble_view) {
   if (message_center_bubble() &&
       bubble_view == message_center_bubble()->bubble_view()) {
     HideMessageCenterBubble();
   } else if (popup_bubble() && bubble_view == popup_bubble()->bubble_view()) {
     HidePopupBubble();
   }
 }
 
 bool WebNotificationTray::PerformAction(const ui::Event& event) {
   ToggleMessageCenterBubble();
@@ skipping 20 matching lines @@
 string16 WebNotificationTray::GetAccessibleNameForBubble() {
   return GetAccessibleNameForTray();
 }
 
 gfx::Rect WebNotificationTray::GetAnchorRect(views::Widget* anchor_widget,
                                              AnchorType anchor_type,
                                              AnchorAlignment anchor_alignment) {
   return GetBubbleAnchorRect(anchor_widget, anchor_type, anchor_alignment);
 }
 
-void WebNotificationTray::HideBubble(const TrayBubbleView* bubble_view) {
+void WebNotificationTray::HideBubble(const views::TrayBubbleView* bubble_view) {
   HideBubbleWithView(bubble_view);
 }
 
 void WebNotificationTray::MessageCenterChanged(bool new_notification) {
   if (message_center_bubble()) {
     if (message_center_->NotificationCount() == 0)
       HideMessageCenterBubble();
     else
       message_center_bubble()->bubble()->ScheduleUpdate();
   }
@@ skipping 57 matching lines @@
 bool WebNotificationTray::ClickedOutsideBubble() {
   // Only hide the message center.
   if (!message_center_bubble())
     return false;
   HideMessageCenterBubble();
   return true;
 }
 
 // Methods for testing
 
-MessageCenterBubble* WebNotificationTray::GetMessageCenterBubbleForTest() {
+message_center::MessageCenterBubble*
+WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble_.get())
     return NULL;
-  return static_cast<MessageCenterBubble*>(message_center_bubble_->bubble());
+  return static_cast<message_center::MessageCenterBubble*>(
+      message_center_bubble_->bubble());
 }
 
-PopupBubble* WebNotificationTray::GetPopupBubbleForTest() {
+message_center::MessagePopupBubble*
+WebNotificationTray::GetPopupBubbleForTest() {
   if (!popup_bubble_.get())
     return NULL;
-  return static_cast<PopupBubble*>(popup_bubble_->bubble());
+  return static_cast<message_center::MessagePopupBubble*>(
+      popup_bubble_->bubble());
 }
 
 }  // namespace ash