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

Side by Side Diff: ash/system/tray/system_tray.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
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 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <vector> 10 #include <vector>
11 11
12 #include "ash/ash_export.h" 12 #include "ash/ash_export.h"
13 #include "ash/common/system/tray/system_tray_bubble.h" 13 #include "ash/common/system/tray/system_tray_bubble.h"
14 #include "ash/common/system/tray/tray_background_view.h" 14 #include "ash/common/system/tray/tray_background_view.h"
15 #include "ash/system/cast/tray_cast.h"
16 #include "base/macros.h" 15 #include "base/macros.h"
17 #include "base/memory/scoped_vector.h" 16 #include "base/memory/scoped_vector.h"
18 #include "ui/views/bubble/tray_bubble_view.h" 17 #include "ui/views/bubble/tray_bubble_view.h"
19 #include "ui/views/view.h" 18 #include "ui/views/view.h"
20 19
21 namespace ash { 20 namespace ash {
22 21
23 enum class LoginStatus; 22 enum class LoginStatus;
24 class ScreenTrayItem; 23 class ScreenTrayItem;
25 class SystemBubbleWrapper; 24 class SystemBubbleWrapper;
26 class SystemTrayDelegate; 25 class SystemTrayDelegate;
27 class SystemTrayItem; 26 class SystemTrayItem;
28 class TrayAccessibility; 27 class TrayAccessibility;
28 class TrayCast;
29 class TrayDate; 29 class TrayDate;
30 class TrayUpdate; 30 class TrayUpdate;
31 class TrayUser; 31 class TrayUser;
32 class WebNotificationTray; 32 class WebNotificationTray;
33 33
34 // There are different methods for creating bubble views. 34 // There are different methods for creating bubble views.
35 enum BubbleCreationType { 35 enum BubbleCreationType {
36 BUBBLE_CREATE_NEW, // Closes any existing bubble and creates a new one. 36 BUBBLE_CREATE_NEW, // Closes any existing bubble and creates a new one.
37 BUBBLE_USE_EXISTING, // Uses any existing bubble, or creates a new one. 37 BUBBLE_USE_EXISTING, // Uses any existing bubble, or creates a new one.
38 }; 38 };
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 // A reference to the Screen share and capture item. 258 // A reference to the Screen share and capture item.
259 ScreenTrayItem* screen_capture_tray_item_; // not owned 259 ScreenTrayItem* screen_capture_tray_item_; // not owned
260 ScreenTrayItem* screen_share_tray_item_; // not owned 260 ScreenTrayItem* screen_share_tray_item_; // not owned
261 261
262 DISALLOW_COPY_AND_ASSIGN(SystemTray); 262 DISALLOW_COPY_AND_ASSIGN(SystemTray);
263 }; 263 };
264 264
265 } // namespace ash 265 } // namespace ash
266 266
267 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 267 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/chromeos/screen_security/screen_tray_item_unittest.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698