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

Side by Side Diff: media/mojo/services/service_factory_impl.h

Issue 1435063002: Eliminate third_party/mojo/src from all targets' include paths (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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 | « media/mojo/services/mojo_cdm_service.h ('k') | mojo/android/javatests/mojo_test_case.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 MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_ 5 #ifndef MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_
6 #define MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_ 6 #define MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "media/mojo/interfaces/service_factory.mojom.h" 10 #include "media/mojo/interfaces/service_factory.mojom.h"
11 #include "media/mojo/services/mojo_cdm_service_context.h" 11 #include "media/mojo/services/mojo_cdm_service_context.h"
12 #include "mojo/public/cpp/bindings/strong_binding.h" 12 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
13 13
14 namespace mojo { 14 namespace mojo {
15 class AppRefCount; 15 class AppRefCount;
16 class ServiceProvider; 16 class ServiceProvider;
17 } 17 }
18 18
19 namespace media { 19 namespace media {
20 20
21 class CdmFactory; 21 class CdmFactory;
22 class MediaLog; 22 class MediaLog;
(...skipping 26 matching lines...) Expand all
49 49
50 scoped_ptr<RendererFactory> renderer_factory_; 50 scoped_ptr<RendererFactory> renderer_factory_;
51 scoped_ptr<CdmFactory> cdm_factory_; 51 scoped_ptr<CdmFactory> cdm_factory_;
52 52
53 DISALLOW_COPY_AND_ASSIGN(ServiceFactoryImpl); 53 DISALLOW_COPY_AND_ASSIGN(ServiceFactoryImpl);
54 }; 54 };
55 55
56 } // namespace media 56 } // namespace media
57 57
58 #endif // MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_ 58 #endif // MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_cdm_service.h ('k') | mojo/android/javatests/mojo_test_case.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698