OLD | NEW |
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 CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
11 #include <set> | 11 #include <set> |
12 #include <string> | 12 #include <string> |
13 #include <utility> | 13 #include <utility> |
14 #include <vector> | 14 #include <vector> |
15 | 15 |
16 #include "base/macros.h" | 16 #include "base/macros.h" |
17 #include "base/memory/weak_ptr.h" | 17 #include "base/memory/weak_ptr.h" |
18 #include "build/build_config.h" | 18 #include "build/build_config.h" |
19 #include "content/public/browser/content_browser_client.h" | 19 #include "content/public/browser/content_browser_client.h" |
20 #include "extensions/features/features.h" | 20 #include "extensions/features/features.h" |
21 #include "media/media_features.h" | 21 #include "media/media_features.h" |
22 #include "ppapi/features/features.h" | 22 #include "ppapi/features/features.h" |
| 23 #include "services/service_manager/public/cpp/binder_registry.h" |
23 | 24 |
24 class ChromeContentBrowserClientParts; | 25 class ChromeContentBrowserClientParts; |
25 | 26 |
26 namespace base { | 27 namespace base { |
27 class CommandLine; | 28 class CommandLine; |
28 } | 29 } |
29 | 30 |
30 namespace blink { | 31 namespace blink { |
31 namespace mojom { | 32 namespace mojom { |
32 class WindowFeatures; | 33 class WindowFeatures; |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
275 const base::CommandLine& command_line, | 276 const base::CommandLine& command_line, |
276 int child_process_id, | 277 int child_process_id, |
277 content::FileDescriptorInfo* mappings) override; | 278 content::FileDescriptorInfo* mappings) override; |
278 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) | 279 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) |
279 #if defined(OS_WIN) | 280 #if defined(OS_WIN) |
280 bool PreSpawnRenderer(sandbox::TargetPolicy* policy) override; | 281 bool PreSpawnRenderer(sandbox::TargetPolicy* policy) override; |
281 base::string16 GetAppContainerSidForSandboxType( | 282 base::string16 GetAppContainerSidForSandboxType( |
282 int sandbox_type) const override; | 283 int sandbox_type) const override; |
283 #endif | 284 #endif |
284 void ExposeInterfacesToRenderer( | 285 void ExposeInterfacesToRenderer( |
285 service_manager::InterfaceRegistry* registry, | 286 service_manager::BinderRegistry* registry, |
286 content::RenderProcessHost* render_process_host) override; | 287 content::RenderProcessHost* render_process_host) override; |
287 void ExposeInterfacesToMediaService( | 288 void ExposeInterfacesToMediaService( |
288 service_manager::InterfaceRegistry* registry, | 289 service_manager::InterfaceRegistry* registry, |
289 content::RenderFrameHost* render_frame_host) override; | 290 content::RenderFrameHost* render_frame_host) override; |
290 void RegisterRenderFrameMojoInterfaces( | 291 void RegisterRenderFrameMojoInterfaces( |
291 service_manager::InterfaceRegistry* registry, | 292 service_manager::InterfaceRegistry* registry, |
292 content::RenderFrameHost* render_frame_host) override; | 293 content::RenderFrameHost* render_frame_host) override; |
293 void ExposeInterfacesToGpuProcess( | 294 void BindInterfaceRequest( |
294 service_manager::InterfaceRegistry* registry, | 295 const service_manager::ServiceInfo& source_info, |
295 content::GpuProcessHost* render_process_host) override; | 296 const std::string& interface_name, |
| 297 mojo::ScopedMessagePipeHandle* interface_pipe) override; |
296 void RegisterInProcessServices(StaticServiceMap* services) override; | 298 void RegisterInProcessServices(StaticServiceMap* services) override; |
297 void RegisterOutOfProcessServices( | 299 void RegisterOutOfProcessServices( |
298 OutOfProcessServiceMap* services) override; | 300 OutOfProcessServiceMap* services) override; |
299 std::unique_ptr<base::Value> GetServiceManifestOverlay( | 301 std::unique_ptr<base::Value> GetServiceManifestOverlay( |
300 base::StringPiece name) override; | 302 base::StringPiece name) override; |
301 std::vector<content::ContentBrowserClient::ServiceManifestInfo> | 303 std::vector<content::ContentBrowserClient::ServiceManifestInfo> |
302 GetExtraServiceManifests() override; | 304 GetExtraServiceManifests() override; |
303 void OpenURL(content::BrowserContext* browser_context, | 305 void OpenURL(content::BrowserContext* browser_context, |
304 const content::OpenURLParams& params, | 306 const content::OpenURLParams& params, |
305 const base::Callback<void(content::WebContents*)>& callback) | 307 const base::Callback<void(content::WebContents*)>& callback) |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
378 std::set<std::string> allowed_file_handle_origins_; | 380 std::set<std::string> allowed_file_handle_origins_; |
379 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable | 381 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable |
380 // versions of Chrome. | 382 // versions of Chrome. |
381 std::set<std::string> allowed_dev_channel_origins_; | 383 std::set<std::string> allowed_dev_channel_origins_; |
382 #endif | 384 #endif |
383 | 385 |
384 // Vector of additional ChromeContentBrowserClientParts. | 386 // Vector of additional ChromeContentBrowserClientParts. |
385 // Parts are deleted in the reverse order they are added. | 387 // Parts are deleted in the reverse order they are added. |
386 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 388 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
387 | 389 |
| 390 service_manager::BinderRegistry gpu_binder_registry_; |
| 391 |
388 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 392 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
389 | 393 |
390 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 394 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
391 }; | 395 }; |
392 | 396 |
393 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 397 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |