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/wm_shell.h" | |
8 #include "ash/shelf/overflow_bubble_view.h" | 7 #include "ash/shelf/overflow_bubble_view.h" |
9 #include "ash/shelf/overflow_button.h" | 8 #include "ash/shelf/overflow_button.h" |
10 #include "ash/shelf/shelf_view.h" | 9 #include "ash/shelf/shelf_view.h" |
11 #include "ash/shelf/wm_shelf.h" | 10 #include "ash/shelf/wm_shelf.h" |
12 #include "ash/system/tray/tray_background_view.h" | 11 #include "ash/system/tray/tray_background_view.h" |
| 12 #include "ash/wm_shell.h" |
13 #include "ui/gfx/geometry/rect.h" | 13 #include "ui/gfx/geometry/rect.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(WmShelf* wm_shelf) | 18 OverflowBubble::OverflowBubble(WmShelf* wm_shelf) |
19 : wm_shelf_(wm_shelf), | 19 : wm_shelf_(wm_shelf), |
20 bubble_(nullptr), | 20 bubble_(nullptr), |
21 overflow_button_(nullptr), | 21 overflow_button_(nullptr), |
22 shelf_view_(nullptr) { | 22 shelf_view_(nullptr) { |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) { | 85 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) { |
86 DCHECK(widget == bubble_->GetWidget()); | 86 DCHECK(widget == bubble_->GetWidget()); |
87 // Update the overflow button in the parent ShelfView. | 87 // Update the overflow button in the parent ShelfView. |
88 overflow_button_->SchedulePaint(); | 88 overflow_button_->SchedulePaint(); |
89 bubble_ = nullptr; | 89 bubble_ = nullptr; |
90 overflow_button_ = nullptr; | 90 overflow_button_ = nullptr; |
91 shelf_view_ = nullptr; | 91 shelf_view_ = nullptr; |
92 } | 92 } |
93 | 93 |
94 } // namespace ash | 94 } // namespace ash |
OLD | NEW |