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

Side by Side Diff: content/public/browser/content_browser_client.h

Issue 1947313002: Enable content embedders to specify mojo application task runner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: restores mojo:media in browser Created 4 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 | « content/gpu/gpu_process_control_impl.cc ('k') | content/public/common/mojo_application_info.h » ('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_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 #include <utility> 13 #include <utility>
14 #include <vector> 14 #include <vector>
15 15
16 #include "base/callback_forward.h" 16 #include "base/callback_forward.h"
17 #include "base/memory/scoped_vector.h" 17 #include "base/memory/scoped_vector.h"
18 #include "base/values.h" 18 #include "base/values.h"
19 #include "build/build_config.h" 19 #include "build/build_config.h"
20 #include "content/public/browser/certificate_request_result_type.h" 20 #include "content/public/browser/certificate_request_result_type.h"
21 #include "content/public/browser/navigation_throttle.h" 21 #include "content/public/browser/navigation_throttle.h"
22 #include "content/public/common/content_client.h" 22 #include "content/public/common/content_client.h"
23 #include "content/public/common/media_stream_request.h" 23 #include "content/public/common/media_stream_request.h"
24 #include "content/public/common/mojo_application_info.h"
24 #include "content/public/common/resource_type.h" 25 #include "content/public/common/resource_type.h"
25 #include "content/public/common/socket_permission_request.h" 26 #include "content/public/common/socket_permission_request.h"
26 #include "content/public/common/window_container_type.h" 27 #include "content/public/common/window_container_type.h"
27 #include "media/audio/audio_manager.h" 28 #include "media/audio/audio_manager.h"
28 #include "net/base/mime_util.h" 29 #include "net/base/mime_util.h"
29 #include "net/cookies/canonical_cookie.h" 30 #include "net/cookies/canonical_cookie.h"
30 #include "storage/browser/fileapi/file_system_context.h" 31 #include "storage/browser/fileapi/file_system_context.h"
31 #include "third_party/WebKit/public/platform/WebPageVisibilityState.h" 32 #include "third_party/WebKit/public/platform/WebPageVisibilityState.h"
32 #include "ui/base/window_open_disposition.h" 33 #include "ui/base/window_open_disposition.h"
33 34
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 virtual void RegisterFrameMojoShellServices( 644 virtual void RegisterFrameMojoShellServices(
644 ServiceRegistry* registry, 645 ServiceRegistry* registry,
645 RenderFrameHost* render_frame_host) {} 646 RenderFrameHost* render_frame_host) {}
646 647
647 // Allows to register browser Mojo services exposed through the 648 // Allows to register browser Mojo services exposed through the
648 // RenderFrameHost. 649 // RenderFrameHost.
649 virtual void RegisterRenderFrameMojoServices( 650 virtual void RegisterRenderFrameMojoServices(
650 ServiceRegistry* registry, 651 ServiceRegistry* registry,
651 RenderFrameHost* render_frame_host) {} 652 RenderFrameHost* render_frame_host) {}
652 653
653 using StaticMojoApplicationMap = 654 using StaticMojoApplicationMap = std::map<std::string, MojoApplicationInfo>;
654 std::map<std::string,
655 base::Callback<std::unique_ptr<shell::ShellClient>(
656 const base::Closure& quit_closure)>>;
657 655
658 // Registers Mojo applications to be loaded in the browser process by the 656 // Registers Mojo applications to be loaded in the browser process by the
659 // browser's global Mojo shell. 657 // browser's global Mojo shell.
660 virtual void RegisterInProcessMojoApplications( 658 virtual void RegisterInProcessMojoApplications(
661 StaticMojoApplicationMap* apps) {} 659 StaticMojoApplicationMap* apps) {}
662 660
663 using OutOfProcessMojoApplicationMap = std::map<std::string, base::string16>; 661 using OutOfProcessMojoApplicationMap = std::map<std::string, base::string16>;
664 662
665 // Registers Mojo applications to be loaded out of the browser process, in a 663 // Registers Mojo applications to be loaded out of the browser process, in a
666 // sandboxed utility process. The value of each map entry should be the 664 // sandboxed utility process. The value of each map entry should be the
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 // Allows an embedder to provide its own ExternalVideoSurfaceContainer 758 // Allows an embedder to provide its own ExternalVideoSurfaceContainer
761 // implementation. Return nullptr to disable external surface video. 759 // implementation. Return nullptr to disable external surface video.
762 virtual ExternalVideoSurfaceContainer* 760 virtual ExternalVideoSurfaceContainer*
763 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents); 761 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents);
764 #endif 762 #endif
765 }; 763 };
766 764
767 } // namespace content 765 } // namespace content
768 766
769 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 767 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « content/gpu/gpu_process_control_impl.cc ('k') | content/public/common/mojo_application_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698