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/launcher/overflow_bubble.h" | 5 #include "ash/launcher/overflow_bubble.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ash/launcher/launcher_types.h" | 9 #include "ash/launcher/launcher_types.h" |
10 #include "ash/launcher/launcher_view.h" | 10 #include "ash/launcher/launcher_view.h" |
11 #include "ash/root_window_controller.h" | 11 #include "ash/root_window_controller.h" |
12 #include "ash/shelf/shelf_layout_manager.h" | 12 #include "ash/shelf/shelf_layout_manager.h" |
| 13 #include "ash/shelf/shelf_widget.h" |
13 #include "ash/shell.h" | 14 #include "ash/shell.h" |
14 #include "ash/system/tray/system_tray.h" | 15 #include "ash/system/tray/system_tray.h" |
15 #include "ui/aura/root_window.h" | 16 #include "ui/aura/root_window.h" |
16 #include "ui/gfx/insets.h" | 17 #include "ui/gfx/insets.h" |
17 #include "ui/gfx/screen.h" | 18 #include "ui/gfx/screen.h" |
18 #include "ui/views/bubble/bubble_delegate.h" | 19 #include "ui/views/bubble/bubble_delegate.h" |
19 #include "ui/views/bubble/bubble_frame_view.h" | 20 #include "ui/views/bubble/bubble_frame_view.h" |
20 #include "ui/views/widget/widget.h" | 21 #include "ui/views/widget/widget.h" |
21 | 22 |
22 namespace ash { | 23 namespace ash { |
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
269 bubble_->GetWidget()->RemoveObserver(this); | 270 bubble_->GetWidget()->RemoveObserver(this); |
270 bubble_->GetWidget()->Close(); | 271 bubble_->GetWidget()->Close(); |
271 bubble_ = NULL; | 272 bubble_ = NULL; |
272 launcher_view_ = NULL; | 273 launcher_view_ = NULL; |
273 } | 274 } |
274 | 275 |
275 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) { | 276 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) { |
276 DCHECK(widget == bubble_->GetWidget()); | 277 DCHECK(widget == bubble_->GetWidget()); |
277 bubble_ = NULL; | 278 bubble_ = NULL; |
278 launcher_view_ = NULL; | 279 launcher_view_ = NULL; |
| 280 ShelfLayoutManager::ForLauncher( |
| 281 widget->GetNativeView())->shelf_widget()->launcher()->SchedulePaint(); |
279 } | 282 } |
280 | 283 |
281 } // namespace internal | 284 } // namespace internal |
282 } // namespace ash | 285 } // namespace ash |
OLD | NEW |