diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 23:57:44 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 23:57:44 +0000 |
| commit | 15a0b171aa7b0be9e936341a6df4e8c50d6f6bf6 (patch) | |
| tree | 90b418ce0a5b45197099c7aabc0563e86fce3e57 /ash/system/tray/system_tray_bubble.cc | |
| parent | d63fe80b84af1fc87736014dfa791c6bb26fe2b2 (diff) | |
| download | chromium_src-15a0b171aa7b0be9e936341a6df4e8c50d6f6bf6.zip chromium_src-15a0b171aa7b0be9e936341a6df4e8c50d6f6bf6.tar.gz chromium_src-15a0b171aa7b0be9e936341a6df4e8c50d6f6bf6.tar.bz2 | |
* 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
Diffstat (limited to 'ash/system/tray/system_tray_bubble.cc')
| -rw-r--r-- | ash/system/tray/system_tray_bubble.cc | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/ash/system/tray/system_tray_bubble.cc b/ash/system/tray/system_tray_bubble.cc index e7bc317..47c77af 100644 --- a/ash/system/tray/system_tray_bubble.cc +++ b/ash/system/tray/system_tray_bubble.cc @@ -20,6 +20,8 @@ #include "ui/views/view.h" #include "ui/views/widget/widget.h" +using message_center::TrayBubbleView; + namespace ash { namespace { @@ -240,35 +242,9 @@ void SystemTrayBubble::InitView(views::View* anchor, init_params->close_on_deactivate = false; } bubble_view_ = TrayBubbleView::Create( - tray_->GetBubbleWindowContainer(), anchor, this, init_params); + tray_->GetBubbleWindowContainer(), anchor, tray_, init_params); CreateItemViews(login_status); - - bubble_wrapper_.reset(new internal::TrayBubbleWrapper(tray_, bubble_view_)); -} - -void SystemTrayBubble::BubbleViewDestroyed() { - DestroyItemViews(); - bubble_view_ = NULL; -} - -void SystemTrayBubble::OnMouseEnteredView() { - StopAutoCloseTimer(); -} - -void SystemTrayBubble::OnMouseExitedView() { - RestartAutoCloseTimer(); -} - -string16 SystemTrayBubble::GetAccessibleName() { - return tray_->GetAccessibleName(); -} - -gfx::Rect SystemTrayBubble::GetAnchorRect( - views::Widget* anchor_widget, - TrayBubbleView::AnchorType anchor_type, - TrayBubbleView::AnchorAlignment anchor_alignment) { - return tray_->GetAnchorRect(anchor_widget, anchor_type, anchor_alignment); } void SystemTrayBubble::DestroyItemViews() { @@ -289,6 +265,10 @@ void SystemTrayBubble::DestroyItemViews() { } } +void SystemTrayBubble::BubbleViewDestroyed() { + bubble_view_ = NULL; +} + void SystemTrayBubble::StartAutoCloseTimer(int seconds) { autoclose_.Stop(); autoclose_delay_ = seconds; |