Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(506)

Side by Side Diff: ash/system/tray/tray_bubble_wrapper.cc

Issue 1929203002: mash: Fix crash when clicking on the shelf overflow icon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/system/tray/tray_background_view.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/system/tray/tray_bubble_wrapper.h" 5 #include "ash/system/tray/tray_bubble_wrapper.h"
6 6
7 #include "ash/system/tray/tray_background_view.h" 7 #include "ash/system/tray/tray_background_view.h"
8 #include "ash/system/tray/tray_event_filter.h" 8 #include "ash/system/tray/tray_event_filter.h"
9 #include "ash/wm/window_properties.h" 9 #include "ash/wm/window_properties.h"
10 #include "ui/aura/client/capture_client.h" 10 #include "ui/aura/client/capture_client.h"
11 #include "ui/aura/window.h" 11 #include "ui/aura/window.h"
12 #include "ui/aura/window_event_dispatcher.h" 12 #include "ui/aura/window_event_dispatcher.h"
13 #include "ui/views/bubble/tray_bubble_view.h" 13 #include "ui/views/bubble/tray_bubble_view.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 TrayBubbleWrapper::TrayBubbleWrapper(TrayBackgroundView* tray, 18 TrayBubbleWrapper::TrayBubbleWrapper(TrayBackgroundView* tray,
19 views::TrayBubbleView* bubble_view) 19 views::TrayBubbleView* bubble_view)
20 : tray_(tray), 20 : tray_(tray),
21 bubble_view_(bubble_view) { 21 bubble_view_(bubble_view) {
22 bubble_widget_ = views::BubbleDialogDelegateView::CreateBubble(bubble_view_); 22 bubble_widget_ = views::BubbleDialogDelegateView::CreateBubble(bubble_view_);
23 bubble_widget_->AddObserver(this); 23 bubble_widget_->AddObserver(this);
24 24
25 tray_->InitializeBubbleAnimations(bubble_widget_); 25 TrayBackgroundView::InitializeBubbleAnimations(bubble_widget_);
26 tray_->UpdateBubbleViewArrow(bubble_view_); 26 tray_->UpdateBubbleViewArrow(bubble_view_);
27 bubble_view_->InitializeAndShowBubble(); 27 bubble_view_->InitializeAndShowBubble();
28 28
29 tray->tray_event_filter()->AddWrapper(this); 29 tray->tray_event_filter()->AddWrapper(this);
30 } 30 }
31 31
32 TrayBubbleWrapper::~TrayBubbleWrapper() { 32 TrayBubbleWrapper::~TrayBubbleWrapper() {
33 tray_->tray_event_filter()->RemoveWrapper(this); 33 tray_->tray_event_filter()->RemoveWrapper(this);
34 if (bubble_widget_) { 34 if (bubble_widget_) {
35 bubble_widget_->RemoveObserver(this); 35 bubble_widget_->RemoveObserver(this);
(...skipping 17 matching lines...) Expand all
53 tray_->HideBubbleWithView(bubble_view_); // May destroy |bubble_view_| 53 tray_->HideBubbleWithView(bubble_view_); // May destroy |bubble_view_|
54 } 54 }
55 55
56 void TrayBubbleWrapper::OnWidgetBoundsChanged(views::Widget* widget, 56 void TrayBubbleWrapper::OnWidgetBoundsChanged(views::Widget* widget,
57 const gfx::Rect& new_bounds) { 57 const gfx::Rect& new_bounds) {
58 DCHECK_EQ(bubble_widget_, widget); 58 DCHECK_EQ(bubble_widget_, widget);
59 tray_->BubbleResized(bubble_view_); 59 tray_->BubbleResized(bubble_view_);
60 } 60 }
61 61
62 } // namespace ash 62 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/tray_background_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698