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

Side by Side Diff: content/browser/mojo/mojo_application_host.h

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fixes Created 4 years, 11 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_ 5 #ifndef CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_
6 #define CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_ 6 #define CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_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 "base/process/process_handle.h" 10 #include "base/process/process_handle.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "content/common/application_setup.mojom.h" 12 #include "content/common/application_setup.mojom.h"
13 #include "content/common/mojo/channel_init.h" 13 #include "content/common/mojo/channel_init.h"
14 #include "content/common/mojo/service_registry_impl.h" 14 #include "content/common/mojo/service_registry_impl.h"
15 #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" 15 #include "mojo/edk/embedder/scoped_platform_handle.h"
16 16
17 #if defined(OS_ANDROID) 17 #if defined(OS_ANDROID)
18 #include "content/browser/mojo/service_registry_android.h" 18 #include "content/browser/mojo/service_registry_android.h"
19 #endif 19 #endif
20 20
21 namespace IPC { 21 namespace IPC {
22 class Sender; 22 class Sender;
23 } 23 }
24 24
25 namespace content { 25 namespace content {
(...skipping 22 matching lines...) Expand all
48 ServiceRegistryAndroid* service_registry_android() { 48 ServiceRegistryAndroid* service_registry_android() {
49 return service_registry_android_.get(); 49 return service_registry_android_.get();
50 } 50 }
51 #endif 51 #endif
52 52
53 void OverrideIOTaskRunnerForTest( 53 void OverrideIOTaskRunnerForTest(
54 scoped_refptr<base::TaskRunner> io_task_runner); 54 scoped_refptr<base::TaskRunner> io_task_runner);
55 55
56 private: 56 private:
57 ChannelInit channel_init_; 57 ChannelInit channel_init_;
58 mojo::embedder::ScopedPlatformHandle client_handle_; 58 mojo::edk::ScopedPlatformHandle client_handle_;
59 59
60 bool did_activate_; 60 bool did_activate_;
61 61
62 scoped_ptr<ApplicationSetup> application_setup_; 62 scoped_ptr<ApplicationSetup> application_setup_;
63 ServiceRegistryImpl service_registry_; 63 ServiceRegistryImpl service_registry_;
64 64
65 scoped_refptr<base::TaskRunner> io_task_runner_override_; 65 scoped_refptr<base::TaskRunner> io_task_runner_override_;
66 66
67 #if defined(OS_ANDROID) 67 #if defined(OS_ANDROID)
68 scoped_ptr<ServiceRegistryAndroid> service_registry_android_; 68 scoped_ptr<ServiceRegistryAndroid> service_registry_android_;
69 #endif 69 #endif
70 70
71 DISALLOW_COPY_AND_ASSIGN(MojoApplicationHost); 71 DISALLOW_COPY_AND_ASSIGN(MojoApplicationHost);
72 }; 72 };
73 73
74 } // namespace content 74 } // namespace content
75 75
76 #endif // CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_ 76 #endif // CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698