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

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

Issue 1858103002: Strawman proposal for dealing with Android java mojo services registry in browser code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tweak a couple more headers. Created 4 years, 8 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"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 void OverrideIOTaskRunnerForTest( 52 void OverrideIOTaskRunnerForTest(
53 scoped_refptr<base::TaskRunner> io_task_runner); 53 scoped_refptr<base::TaskRunner> io_task_runner);
54 54
55 private: 55 private:
56 ChannelInit channel_init_; 56 ChannelInit channel_init_;
57 mojo::edk::ScopedPlatformHandle client_handle_; 57 mojo::edk::ScopedPlatformHandle client_handle_;
58 58
59 bool did_activate_; 59 bool did_activate_;
60 60
61 scoped_ptr<mojom::ApplicationSetup> application_setup_; 61 scoped_ptr<mojom::ApplicationSetup> application_setup_;
62 ServiceRegistryImpl service_registry_; 62 BrowserServiceRegistryImpl service_registry_;
63 63
64 scoped_refptr<base::TaskRunner> io_task_runner_override_; 64 scoped_refptr<base::TaskRunner> io_task_runner_override_;
65 65
66 #if defined(OS_ANDROID)
67 scoped_ptr<ServiceRegistryAndroid> service_registry_android_;
68 #endif
69
70 DISALLOW_COPY_AND_ASSIGN(MojoApplicationHost); 66 DISALLOW_COPY_AND_ASSIGN(MojoApplicationHost);
71 }; 67 };
72 68
73 } // namespace content 69 } // namespace content
74 70
75 #endif // CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_ 71 #endif // CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_
OLDNEW
« no previous file with comments | « content/browser/mojo/browser_service_registry_impl.h ('k') | content/browser/service_worker/embedded_worker_instance.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698