* Make web/system trays delegates instead of bubbles.

* Move TrayBubbleWrapper to trays.
* Remove remaining ash dependencies in message_center views.

Code diagram with changes:
https://docs.google.com/drawings/d/1B6ZxXObmrDFzgWEHmkP_Ppt2BFbOL9kXzakOmY0sXe0/edit

BUG=150872
For ash/wm/gestures/tray_gesture_handler.cc:
TBR=sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/11154022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162849 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 11 deletions

diff --git a/ash/system/web_notification/web_notification_view.h b/ash/system/web_notification/web_notification_view.h
index 688738c..2606166 100644
--- a/ash/system/web_notification/web_notification_view.h
+++ b/ash/system/web_notification/web_notification_view.h
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_NOTIFICATION_WEB_NOTIFICATION_VIEW_H_
-#define ASH_SYSTEM_NOTIFICATION_WEB_NOTIFICATION_VIEW_H_
+#ifndef ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_VIEW_H_
+#define ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_VIEW_H_
 
 #include "ash/system/web_notification/web_notification.h"
+#include "ash/system/web_notification/web_notification_list.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
@@ -16,10 +17,6 @@ class ImageView;
 class ScrollView;
 }
 
-namespace ash {
-
-class WebNotificationTray;
-
 namespace message_center {
 
 // Individual notifications constants
@@ -32,7 +29,7 @@ class WebNotificationView : public views::View,
                             public views::ButtonListener,
                             public ui::ImplicitAnimationObserver {
  public:
-  WebNotificationView(WebNotificationTray* tray,
+  WebNotificationView(WebNotificationList::Delegate* list_delegate,
                       const WebNotification& notification,
                       int scroll_bar_width);
 
@@ -68,7 +65,7 @@ class WebNotificationView : public views::View,
   // Slides the view out and closes it after the animation.
   void SlideOutAndClose(SlideDirection direction);
 
-  WebNotificationTray* tray_;
+  WebNotificationList::Delegate* list_delegate_;
   WebNotification notification_;
   views::ImageView* icon_;
   views::ImageButton* close_button_;
@@ -81,6 +78,4 @@ class WebNotificationView : public views::View,
 
 }  // namespace message_center
 
-}  // namespace ash
-
-#endif // ASH_SYSTEM_NOTIFICATION_WEB_NOTIFICATION_VIEW_H_
+#endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_VIEW_H_