| OLD | NEW |
|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_MEDIA_CONTROLLER_H_ | 5 #ifndef ASH_COMMON_MEDIA_CONTROLLER_H_ |
| 6 #define ASH_MEDIA_CONTROLLER_H_ | 6 #define ASH_COMMON_MEDIA_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include "ash/public/interfaces/media.mojom.h" | 8 #include "ash/public/interfaces/media.mojom.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/observer_list.h" | 10 #include "base/observer_list.h" |
| 11 #include "mojo/public/cpp/bindings/associated_binding.h" | 11 #include "mojo/public/cpp/bindings/associated_binding.h" |
| 12 #include "mojo/public/cpp/bindings/binding_set.h" | 12 #include "mojo/public/cpp/bindings/binding_set.h" |
| 13 | 13 |
| 14 namespace ash { | 14 namespace ash { |
| 15 | 15 |
| 16 // Forwards notifications from the MediaController to observers. | 16 // Forwards notifications from the MediaController to observers. |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 | 56 |
| 57 mojom::MediaClientAssociatedPtr client_; | 57 mojom::MediaClientAssociatedPtr client_; |
| 58 | 58 |
| 59 base::ObserverList<MediaCaptureObserver> observers_; | 59 base::ObserverList<MediaCaptureObserver> observers_; |
| 60 | 60 |
| 61 DISALLOW_COPY_AND_ASSIGN(MediaController); | 61 DISALLOW_COPY_AND_ASSIGN(MediaController); |
| 62 }; | 62 }; |
| 63 | 63 |
| 64 } // namespace ash | 64 } // namespace ash |
| 65 | 65 |
| 66 #endif // ASH_MEDIA_CONTROLLER_H_ | 66 #endif // ASH_COMMON_MEDIA_CONTROLLER_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2734733002:
Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
