| 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.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 "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" | |
| 18 #include "ui/views/widget/widget.h" | 17 #include "ui/views/widget/widget.h" |
| 19 | 18 |
| 20 namespace ash { | 19 namespace ash { |
| 21 | 20 |
| 22 OverflowBubble::OverflowBubble() | 21 OverflowBubble::OverflowBubble() |
| 23 : bubble_(NULL), | 22 : bubble_(NULL), |
| 24 anchor_(NULL), | 23 anchor_(NULL), |
| 25 shelf_view_(NULL) { | 24 shelf_view_(NULL) { |
| 26 } | 25 } |
| 27 | 26 |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 | 91 |
| 93 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) { | 92 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) { |
| 94 DCHECK(widget == bubble_->GetWidget()); | 93 DCHECK(widget == bubble_->GetWidget()); |
| 95 bubble_ = NULL; | 94 bubble_ = NULL; |
| 96 anchor_ = NULL; | 95 anchor_ = NULL; |
| 97 shelf_view_->shelf()->SchedulePaint(); | 96 shelf_view_->shelf()->SchedulePaint(); |
| 98 shelf_view_ = NULL; | 97 shelf_view_ = NULL; |
| 99 } | 98 } |
| 100 | 99 |
| 101 } // namespace ash | 100 } // namespace ash |
| OLD | NEW |