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

Side by Side Diff: ash/system/cast/tray_cast.h

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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/brightness/tray_brightness_unittest.cc ('k') | ash/system/cast/tray_cast.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_CAST_TRAY_CAST_H_ 5 #ifndef ASH_SYSTEM_CAST_TRAY_CAST_H_
6 #define ASH_SYSTEM_CAST_TRAY_CAST_H_ 6 #define ASH_SYSTEM_CAST_TRAY_CAST_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "ash/cast_config_controller.h" 11 #include "ash/common/cast_config_controller.h"
12 #include "ash/shell_observer.h" 12 #include "ash/common/shell_observer.h"
13 #include "ash/system/tray/system_tray_item.h" 13 #include "ash/system/tray/system_tray_item.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 15
16 namespace ash { 16 namespace ash {
17 namespace tray { 17 namespace tray {
18 class CastTrayView; 18 class CastTrayView;
19 class CastDetailedView; 19 class CastDetailedView;
20 class CastDuplexView; 20 class CastDuplexView;
21 } // namespace tray 21 } // namespace tray
22 22
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 tray::CastTrayView* tray_ = nullptr; 75 tray::CastTrayView* tray_ = nullptr;
76 tray::CastDuplexView* default_ = nullptr; 76 tray::CastDuplexView* default_ = nullptr;
77 tray::CastDetailedView* detailed_ = nullptr; 77 tray::CastDetailedView* detailed_ = nullptr;
78 78
79 DISALLOW_COPY_AND_ASSIGN(TrayCast); 79 DISALLOW_COPY_AND_ASSIGN(TrayCast);
80 }; 80 };
81 81
82 } // namespace ash 82 } // namespace ash
83 83
84 #endif // ASH_SYSTEM_CAST_TRAY_CAST_H_ 84 #endif // ASH_SYSTEM_CAST_TRAY_CAST_H_
OLDNEW
« no previous file with comments | « ash/system/brightness/tray_brightness_unittest.cc ('k') | ash/system/cast/tray_cast.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698