OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/shelf/overflow_bubble.h" | 5 #include "ash/shelf/overflow_bubble.h" |
6 | 6 |
7 #include "ash/common/system/tray/tray_background_view.h" | 7 #include "ash/common/system/tray/tray_background_view.h" |
8 #include "ash/shelf/overflow_bubble_view.h" | 8 #include "ash/shelf/overflow_bubble_view.h" |
9 #include "ash/shelf/shelf.h" | 9 #include "ash/shelf/shelf.h" |
10 #include "ash/shelf/shelf_view.h" | 10 #include "ash/shelf/shelf_view.h" |
11 #include "ash/shelf/shelf_widget.h" | 11 #include "ash/shelf/shelf_widget.h" |
12 #include "ash/shell.h" | 12 #include "ash/shell.h" |
13 #include "ui/events/event.h" | 13 #include "ui/events/event.h" |
14 #include "ui/views/widget/widget.h" | 14 #include "ui/views/widget/widget.h" |
15 | 15 |
16 namespace ash { | 16 namespace ash { |
17 | 17 |
18 OverflowBubble::OverflowBubble() | 18 OverflowBubble::OverflowBubble() |
19 : bubble_(NULL), | 19 : bubble_(NULL), anchor_(NULL), shelf_view_(NULL) { |
20 anchor_(NULL), | |
21 shelf_view_(NULL) { | |
22 Shell::GetInstance()->AddPointerWatcher(this); | 20 Shell::GetInstance()->AddPointerWatcher(this); |
23 } | 21 } |
24 | 22 |
25 OverflowBubble::~OverflowBubble() { | 23 OverflowBubble::~OverflowBubble() { |
26 Hide(); | 24 Hide(); |
27 Shell::GetInstance()->RemovePointerWatcher(this); | 25 Shell::GetInstance()->RemovePointerWatcher(this); |
28 } | 26 } |
29 | 27 |
30 void OverflowBubble::Show(views::View* anchor, ShelfView* shelf_view) { | 28 void OverflowBubble::Show(views::View* anchor, ShelfView* shelf_view) { |
31 Hide(); | 29 Hide(); |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 | 83 |
86 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) { | 84 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) { |
87 DCHECK(widget == bubble_->GetWidget()); | 85 DCHECK(widget == bubble_->GetWidget()); |
88 bubble_ = NULL; | 86 bubble_ = NULL; |
89 anchor_ = NULL; | 87 anchor_ = NULL; |
90 shelf_view_->shelf()->SchedulePaint(); | 88 shelf_view_->shelf()->SchedulePaint(); |
91 shelf_view_ = NULL; | 89 shelf_view_ = NULL; |
92 } | 90 } |
93 | 91 |
94 } // namespace ash | 92 } // namespace ash |
OLD | NEW |