OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/system/web_notification/web_notification_tray.h" | 5 #include "ash/system/web_notification/web_notification_tray.h" |
6 | 6 |
7 #include "ash/system/status_area_widget.h" | 7 #include "ash/system/status_area_widget.h" |
8 #include "ash/system/tray/tray_bubble_view.h" | 8 #include "ash/system/tray/tray_bubble_view.h" |
9 #include "ash/system/tray/tray_constants.h" | 9 #include "ash/system/tray/tray_constants.h" |
10 #include "ash/system/tray/tray_views.h" | 10 #include "ash/system/tray/tray_views.h" |
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
627 | 627 |
628 views::Widget* bubble_widget() const { return bubble_widget_; } | 628 views::Widget* bubble_widget() const { return bubble_widget_; } |
629 | 629 |
630 // Overridden from TrayBubbleView::Host. | 630 // Overridden from TrayBubbleView::Host. |
631 virtual void BubbleViewDestroyed() OVERRIDE { | 631 virtual void BubbleViewDestroyed() OVERRIDE { |
632 bubble_view_ = NULL; | 632 bubble_view_ = NULL; |
633 contents_view_ = NULL; | 633 contents_view_ = NULL; |
634 } | 634 } |
635 | 635 |
636 virtual gfx::Rect GetAnchorRect() const OVERRIDE { | 636 virtual gfx::Rect GetAnchorRect() const OVERRIDE { |
637 gfx::Rect anchor_rect = tray_->tray_container()->GetScreenBounds(); | 637 gfx::Rect anchor_rect = tray_->tray_container()->GetBoundsInScreen(); |
638 return anchor_rect; | 638 return anchor_rect; |
639 } | 639 } |
640 | 640 |
641 virtual void OnMouseEnteredView() OVERRIDE { | 641 virtual void OnMouseEnteredView() OVERRIDE { |
642 } | 642 } |
643 | 643 |
644 virtual void OnMouseExitedView() OVERRIDE { | 644 virtual void OnMouseExitedView() OVERRIDE { |
645 } | 645 } |
646 | 646 |
647 virtual void OnClickedOutsideView() OVERRIDE { | 647 virtual void OnClickedOutsideView() OVERRIDE { |
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
888 UpdateIcon(); | 888 UpdateIcon(); |
889 if (!bubble()) | 889 if (!bubble()) |
890 return; | 890 return; |
891 if (GetNotificationCount() == 0) | 891 if (GetNotificationCount() == 0) |
892 status_area_widget_->HideWebNotificationBubble(); | 892 status_area_widget_->HideWebNotificationBubble(); |
893 else | 893 else |
894 bubble_->ScheduleUpdate(); | 894 bubble_->ScheduleUpdate(); |
895 } | 895 } |
896 | 896 |
897 } // namespace ash | 897 } // namespace ash |
OLD | NEW |