Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / ash / system / web_notification / web_notification_tray.h

diff --git a/src/ash/system/web_notification/web_notification_tray.h b/src/ash/system/web_notification/web_notification_tray.h
index 88be4b2..d552191 100644 (file)
--- a/src/ash/system/web_notification/web_notification_tray.h
+++ b/src/ash/system/web_notification/web_notification_tray.h
@@ -41,7 +41,7 @@ namespace ash {
 class StatusAreaWidget;
 class WebNotificationBubbleWrapper;
 class WebNotificationButton;
-class WorkAreaObserver;
+class AshPopupAlignmentDelegate;
 
 class ASH_EXPORT WebNotificationTray
     : public TrayBackgroundView,
@@ -90,9 +90,10 @@ class ASH_EXPORT WebNotificationTray
   virtual void OnMouseEnteredView() OVERRIDE;
   virtual void OnMouseExitedView() OVERRIDE;
   virtual base::string16 GetAccessibleNameForBubble() OVERRIDE;
-  virtual gfx::Rect GetAnchorRect(views::Widget* anchor_widget,
-                                  AnchorType anchor_type,
-                                  AnchorAlignment anchor_alignment) OVERRIDE;
+  virtual gfx::Rect GetAnchorRect(
+      views::Widget* anchor_widget,
+      AnchorType anchor_type,
+      AnchorAlignment anchor_alignment) const OVERRIDE;
   virtual void HideBubble(const views::TrayBubbleView* bubble_view) OVERRIDE;
 
   // Overridden from ButtonListener.
@@ -174,8 +175,7 @@ class ASH_EXPORT WebNotificationTray
   // flickers of the shelf from hidden to shown. See: crbug.com/181213
   bool should_block_shelf_auto_hide_;
 
-  // Observes the work area for |popup_collection_| and notifies to it.
-  scoped_ptr<WorkAreaObserver> work_area_observer_;
+  scoped_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);
 };