ash/common/system/tray/tray_bubble_wrapper.cc - Issue 2099603002: Reland: mash: Convert TrayBackgroundView to wm common types

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2099603002: Reland: mash: Convert TrayBackgroundView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix conflict Created 4 years, 6 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

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/system/tray/tray_bubble_wrapper.h"	5 #include "ash/common/system/tray/tray_bubble_wrapper.h"

6	6

	7 #include "ash/common/system/tray/tray_background_view.h"

	8 #include "ash/common/system/tray/tray_event_filter.h"

7 #include "ash/common/wm_lookup.h"	9 #include "ash/common/wm_lookup.h"

8 #include "ash/common/wm_window.h"	10 #include "ash/common/wm_window.h"

9 #include "ash/system/tray/tray_background_view.h"

10 #include "ash/system/tray/tray_event_filter.h"

11 #include "ui/views/bubble/tray_bubble_view.h"	11 #include "ui/views/bubble/tray_bubble_view.h"

12 #include "ui/views/widget/widget.h"	12 #include "ui/views/widget/widget.h"

13	13

14 namespace ash {	14 namespace ash {

15	15

16 TrayBubbleWrapper::TrayBubbleWrapper(TrayBackgroundView* tray,	16 TrayBubbleWrapper::TrayBubbleWrapper(TrayBackgroundView* tray,

17 views::TrayBubbleView* bubble_view)	17 views::TrayBubbleView* bubble_view)

18 : tray_(tray),	18 : tray_(tray),

19 bubble_view_(bubble_view) {	19 bubble_view_(bubble_view) {

20 bubble_widget_ = views::BubbleDialogDelegateView::CreateBubble(bubble_view_);	20 bubble_widget_ = views::BubbleDialogDelegateView::CreateBubble(bubble_view_);

(...skipping 28 matching lines...) Expand all Loading...
49 tray_->HideBubbleWithView(bubble_view_); // May destroy \|bubble_view_\|	49 tray_->HideBubbleWithView(bubble_view_); // May destroy \|bubble_view_\|

50 }	50 }

51	51

52 void TrayBubbleWrapper::OnWidgetBoundsChanged(views::Widget* widget,	52 void TrayBubbleWrapper::OnWidgetBoundsChanged(views::Widget* widget,

53 const gfx::Rect& new_bounds) {	53 const gfx::Rect& new_bounds) {

54 DCHECK_EQ(bubble_widget_, widget);	54 DCHECK_EQ(bubble_widget_, widget);

55 tray_->BubbleResized(bubble_view_);	55 tray_->BubbleResized(bubble_view_);

56 }	56 }

57	57

58 } // namespace ash	58 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/common/system/tray/tray_bubble_wrapper.h ('k') | ash/common/system/tray/tray_event_filter.h » ('j') | no next file with comments »