| 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/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/shelf/overflow_bubble_view.h" | 8 #include "ash/shelf/overflow_bubble_view.h" |
| 9 #include "ash/shelf/shelf_layout_manager.h" | 9 #include "ash/shelf/shelf_layout_manager.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 "ash/system/tray/system_tray.h" | 13 #include "ash/system/tray/system_tray.h" |
| 14 #include "ui/aura/client/screen_position_client.h" | 14 #include "ui/aura/client/screen_position_client.h" |
| 15 #include "ui/aura/window_event_dispatcher.h" | 15 #include "ui/aura/window_event_dispatcher.h" |
| 16 #include "ui/events/event.h" | 16 #include "ui/events/event.h" |
| 17 #include "ui/gfx/screen.h" | 17 #include "ui/gfx/screen.h" |
| 18 #include "ui/views/widget/widget.h" | 18 #include "ui/views/widget/widget.h" |
| 19 | 19 |
| 20 namespace ash { | 20 namespace ash { |
| 21 namespace internal { | |
| 22 | 21 |
| 23 OverflowBubble::OverflowBubble() | 22 OverflowBubble::OverflowBubble() |
| 24 : bubble_(NULL), | 23 : bubble_(NULL), |
| 25 anchor_(NULL), | 24 anchor_(NULL), |
| 26 shelf_view_(NULL) { | 25 shelf_view_(NULL) { |
| 27 } | 26 } |
| 28 | 27 |
| 29 OverflowBubble::~OverflowBubble() { | 28 OverflowBubble::~OverflowBubble() { |
| 30 Hide(); | 29 Hide(); |
| 31 } | 30 } |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 | 92 |
| 94 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) { | 93 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) { |
| 95 DCHECK(widget == bubble_->GetWidget()); | 94 DCHECK(widget == bubble_->GetWidget()); |
| 96 bubble_ = NULL; | 95 bubble_ = NULL; |
| 97 anchor_ = NULL; | 96 anchor_ = NULL; |
| 98 shelf_view_ = NULL; | 97 shelf_view_ = NULL; |
| 99 ShelfLayoutManager::ForShelf( | 98 ShelfLayoutManager::ForShelf( |
| 100 widget->GetNativeView())->shelf_widget()->shelf()->SchedulePaint(); | 99 widget->GetNativeView())->shelf_widget()->shelf()->SchedulePaint(); |
| 101 } | 100 } |
| 102 | 101 |
| 103 } // namespace internal | |
| 104 } // namespace ash | 102 } // namespace ash |
| OLD | NEW |