ash/common/system/chromeos/screen_security/screen_tray_item.h - Issue 2109613005: mash: Move system tray cast code into //ash/common

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/chromeos/screen_security/screen_tray_item.h

Issue 2109613005: mash: Move system tray cast code into //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: forward decl Created 4 years, 5 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/common/system/chromeos/screen_security/screen_share_tray_item.cc ('k') | ash/common/system/chromeos/screen_security/screen_tray_item.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 #ifndef ASH_SYSTEM_CHROMEOS_SCREEN_TRAY_ITEM_H_	5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_

6 #define ASH_SYSTEM_CHROMEOS_SCREEN_TRAY_ITEM_H_	6 #define ASH_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_

	7

	8 #include <string>

7	9

8 #include "ash/common/system/tray/system_tray_item.h"	10 #include "ash/common/system/tray/system_tray_item.h"

9 #include "ash/common/system/tray/tray_item_view.h"	11 #include "ash/common/system/tray/tray_item_view.h"

10 #include "ash/common/system/tray/tray_notification_view.h"	12 #include "ash/common/system/tray/tray_notification_view.h"

11 #include "ash/common/system/tray/tray_popup_label_button.h"	13 #include "ash/common/system/tray/tray_popup_label_button.h"

12 #include "ash/system/tray/system_tray.h"	14 #include "ash/system/tray/system_tray.h"

13 #include "base/macros.h"	15 #include "base/macros.h"

14 #include "ui/message_center/notification_delegate.h"	16 #include "ui/message_center/notification_delegate.h"

15 #include "ui/views/controls/button/button.h"	17 #include "ui/views/controls/button/button.h"

16 #include "ui/views/controls/image_view.h"	18 #include "ui/views/controls/image_view.h"

(...skipping 109 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
126 tray::ScreenTrayView* tray_view_;	128 tray::ScreenTrayView* tray_view_;

127 tray::ScreenStatusView* default_view_;	129 tray::ScreenStatusView* default_view_;

128 bool is_started_;	130 bool is_started_;

129 base::Closure stop_callback_;	131 base::Closure stop_callback_;

130	132

131 DISALLOW_COPY_AND_ASSIGN(ScreenTrayItem);	133 DISALLOW_COPY_AND_ASSIGN(ScreenTrayItem);

132 };	134 };

133	135

134 } // namespace ash	136 } // namespace ash

135	137

136 #endif // ASH_SYSTEM_CHROMEOS_SCREEN_TRAY_ITEM_H_	138 #endif // ASH_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_

OLD	NEW