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

Side by Side Diff: content/child/child_thread_impl.h

Issue 2836813006: Revert of Eliminate ChildThread InterfaceRegistry. (Closed)
Patch Set: Created 3 years, 7 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 | « no previous file | content/child/child_thread_impl.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_CHILD_CHILD_THREAD_IMPL_H_ 5 #ifndef CONTENT_CHILD_CHILD_THREAD_IMPL_H_
6 #define CONTENT_CHILD_CHILD_THREAD_IMPL_H_ 6 #define CONTENT_CHILD_CHILD_THREAD_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 bool Send(IPC::Message* msg) override; 85 bool Send(IPC::Message* msg) override;
86 86
87 // ChildThread implementation: 87 // ChildThread implementation:
88 #if defined(OS_WIN) 88 #if defined(OS_WIN)
89 void PreCacheFont(const LOGFONT& log_font) override; 89 void PreCacheFont(const LOGFONT& log_font) override;
90 void ReleaseCachedFonts() override; 90 void ReleaseCachedFonts() override;
91 #endif 91 #endif
92 void RecordAction(const base::UserMetricsAction& action) override; 92 void RecordAction(const base::UserMetricsAction& action) override;
93 void RecordComputedAction(const std::string& action) override; 93 void RecordComputedAction(const std::string& action) override;
94 ServiceManagerConnection* GetServiceManagerConnection() override; 94 ServiceManagerConnection* GetServiceManagerConnection() override;
95 service_manager::InterfaceRegistry* GetInterfaceRegistry() override;
95 service_manager::Connector* GetConnector() override; 96 service_manager::Connector* GetConnector() override;
96 97
97 // Returns the service_manager::ServiceInfo for the child process & the 98 // Returns the service_manager::ServiceInfo for the child process & the
98 // browser process, once available. 99 // browser process, once available.
99 const service_manager::ServiceInfo& GetChildServiceInfo() const; 100 const service_manager::ServiceInfo& GetChildServiceInfo() const;
100 const service_manager::ServiceInfo& GetBrowserServiceInfo() const; 101 const service_manager::ServiceInfo& GetBrowserServiceInfo() const;
101 bool IsConnectedToBrowser() const; 102 bool IsConnectedToBrowser() const;
102 103
103 IPC::SyncChannel* channel() { return channel_.get(); } 104 IPC::SyncChannel* channel() { return channel_.get(); }
104 105
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 void GetAssociatedInterface( 239 void GetAssociatedInterface(
239 const std::string& name, 240 const std::string& name,
240 mojom::AssociatedInterfaceAssociatedRequest request) override; 241 mojom::AssociatedInterfaceAssociatedRequest request) override;
241 242
242 // Called when a connection is received from another service. When that other 243 // Called when a connection is received from another service. When that other
243 // service is the browser process, stores the remote's info. 244 // service is the browser process, stores the remote's info.
244 void OnServiceConnect(const service_manager::ServiceInfo& local_info, 245 void OnServiceConnect(const service_manager::ServiceInfo& local_info,
245 const service_manager::ServiceInfo& remote_info); 246 const service_manager::ServiceInfo& remote_info);
246 247
247 std::unique_ptr<mojo::edk::ScopedIPCSupport> mojo_ipc_support_; 248 std::unique_ptr<mojo::edk::ScopedIPCSupport> mojo_ipc_support_;
249 std::unique_ptr<service_manager::InterfaceRegistry> interface_registry_;
248 std::unique_ptr<ServiceManagerConnection> service_manager_connection_; 250 std::unique_ptr<ServiceManagerConnection> service_manager_connection_;
249 251
250 bool connected_to_browser_ = false; 252 bool connected_to_browser_ = false;
251 service_manager::ServiceInfo child_info_; 253 service_manager::ServiceInfo child_info_;
252 service_manager::ServiceInfo browser_info_; 254 service_manager::ServiceInfo browser_info_;
253 255
254 mojo::AssociatedBinding<mojom::RouteProvider> route_provider_binding_; 256 mojo::AssociatedBinding<mojom::RouteProvider> route_provider_binding_;
255 mojo::AssociatedBindingSet<mojom::AssociatedInterfaceProvider, int32_t> 257 mojo::AssociatedBindingSet<mojom::AssociatedInterfaceProvider, int32_t>
256 associated_interface_provider_bindings_; 258 associated_interface_provider_bindings_;
257 mojom::RouteProviderAssociatedPtr remote_route_provider_; 259 mojom::RouteProviderAssociatedPtr remote_route_provider_;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 333
332 private: 334 private:
333 struct Options options_; 335 struct Options options_;
334 336
335 DISALLOW_COPY_AND_ASSIGN(Builder); 337 DISALLOW_COPY_AND_ASSIGN(Builder);
336 }; 338 };
337 339
338 } // namespace content 340 } // namespace content
339 341
340 #endif // CONTENT_CHILD_CHILD_THREAD_IMPL_H_ 342 #endif // CONTENT_CHILD_CHILD_THREAD_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/child/child_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698