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

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

Issue 2895843002: chromeos: Eliminate WmWindow from //ash/system (Closed)
Patch Set: comments Created 3 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/toast/toast_overlay.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.h" 9 #include "ui/aura/window.h"
10 #include "ui/views/bubble/tray_bubble_view.h" 10 #include "ui/views/bubble/tray_bubble_view.h"
11 #include "ui/views/widget/widget.h" 11 #include "ui/views/widget/widget.h"
12 12
13 namespace ash { 13 namespace ash {
14 14
15 TrayBubbleWrapper::TrayBubbleWrapper(TrayBackgroundView* tray, 15 TrayBubbleWrapper::TrayBubbleWrapper(TrayBackgroundView* tray,
16 views::TrayBubbleView* bubble_view) 16 views::TrayBubbleView* bubble_view)
17 : tray_(tray), bubble_view_(bubble_view) { 17 : tray_(tray), bubble_view_(bubble_view) {
18 bubble_widget_ = views::BubbleDialogDelegateView::CreateBubble(bubble_view_); 18 bubble_widget_ = views::BubbleDialogDelegateView::CreateBubble(bubble_view_);
19 bubble_widget_->AddObserver(this); 19 bubble_widget_->AddObserver(this);
(...skipping 15 matching lines...) Expand all
35 35
36 void TrayBubbleWrapper::OnWidgetDestroying(views::Widget* widget) { 36 void TrayBubbleWrapper::OnWidgetDestroying(views::Widget* widget) {
37 CHECK_EQ(bubble_widget_, widget); 37 CHECK_EQ(bubble_widget_, widget);
38 bubble_widget_->RemoveObserver(this); 38 bubble_widget_->RemoveObserver(this);
39 bubble_widget_ = NULL; 39 bubble_widget_ = NULL;
40 40
41 // Although the bubble is already closed, the next mouse release event 41 // Although the bubble is already closed, the next mouse release event
42 // will invoke PerformAction which reopens the bubble again. To prevent the 42 // will invoke PerformAction which reopens the bubble again. To prevent the
43 // reopen, the mouse capture of |tray_| has to be released. 43 // reopen, the mouse capture of |tray_| has to be released.
44 // See crbug.com/177075 44 // See crbug.com/177075
45 WmWindow::Get(tray_->GetWidget()->GetNativeWindow())->ReleaseCapture(); 45 tray_->GetWidget()->GetNativeWindow()->ReleaseCapture();
46 46
47 tray_->HideBubbleWithView(bubble_view_); // May destroy |bubble_view_| 47 tray_->HideBubbleWithView(bubble_view_); // May destroy |bubble_view_|
48 } 48 }
49 49
50 void TrayBubbleWrapper::OnWidgetBoundsChanged(views::Widget* widget, 50 void TrayBubbleWrapper::OnWidgetBoundsChanged(views::Widget* widget,
51 const gfx::Rect& new_bounds) { 51 const gfx::Rect& new_bounds) {
52 DCHECK_EQ(bubble_widget_, widget); 52 DCHECK_EQ(bubble_widget_, widget);
53 tray_->BubbleResized(bubble_view_); 53 tray_->BubbleResized(bubble_view_);
54 } 54 }
55 55
56 } // namespace ash 56 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/toast/toast_overlay.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698