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

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 #ifndef ASH_SYSTEM_TRAY_TRAY_BUBBLE_WRAPPER_H_	5 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_BUBBLE_WRAPPER_H_

6 #define ASH_SYSTEM_TRAY_TRAY_BUBBLE_WRAPPER_H_	6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_BUBBLE_WRAPPER_H_

7	7

8 #include "base/macros.h"	8 #include "base/macros.h"

9 #include "ui/views/widget/widget_observer.h"	9 #include "ui/views/widget/widget_observer.h"

10	10

11 namespace views {	11 namespace views {

12 class TrayBubbleView;	12 class TrayBubbleView;

13 }	13 }

14	14

15 namespace ash {	15 namespace ash {

16 class TrayBackgroundView;	16 class TrayBackgroundView;

(...skipping 20 matching lines...) Expand all Loading...
37 private:	37 private:

38 TrayBackgroundView* tray_;	38 TrayBackgroundView* tray_;

39 views::TrayBubbleView* bubble_view_; // unowned	39 views::TrayBubbleView* bubble_view_; // unowned

40 views::Widget* bubble_widget_;	40 views::Widget* bubble_widget_;

41	41

42 DISALLOW_COPY_AND_ASSIGN(TrayBubbleWrapper);	42 DISALLOW_COPY_AND_ASSIGN(TrayBubbleWrapper);

43 };	43 };

44	44

45 } // namespace ash	45 } // namespace ash

46	46

47 #endif // ASH_SYSTEM_TRAY_TRAY_BUBBLE_WRAPPER_H_	47 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_BUBBLE_WRAPPER_H_

OLD	NEW

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