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

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

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
« no previous file with comments | « content/public/browser/browser_context.h ('k') | content/public/common/mojo_shell_connection.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>
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 } 51 }
52 52
53 namespace gfx { 53 namespace gfx {
54 class ImageSkia; 54 class ImageSkia;
55 } 55 }
56 56
57 namespace media { 57 namespace media {
58 class CdmFactory; 58 class CdmFactory;
59 } 59 }
60 60
61 namespace mojo { 61 namespace shell {
62 class ShellClient; 62 class ShellClient;
63 } 63 }
64 64
65 namespace net { 65 namespace net {
66 class CookieOptions; 66 class CookieOptions;
67 class NetLog; 67 class NetLog;
68 class SSLCertRequestInfo; 68 class SSLCertRequestInfo;
69 class SSLInfo; 69 class SSLInfo;
70 class URLRequest; 70 class URLRequest;
71 class URLRequestContext; 71 class URLRequestContext;
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 RenderFrameHost* render_frame_host) {} 644 RenderFrameHost* render_frame_host) {}
645 645
646 // Allows to register browser Mojo services exposed through the 646 // Allows to register browser Mojo services exposed through the
647 // RenderFrameHost. 647 // RenderFrameHost.
648 virtual void RegisterRenderFrameMojoServices( 648 virtual void RegisterRenderFrameMojoServices(
649 ServiceRegistry* registry, 649 ServiceRegistry* registry,
650 RenderFrameHost* render_frame_host) {} 650 RenderFrameHost* render_frame_host) {}
651 651
652 using StaticMojoApplicationMap = 652 using StaticMojoApplicationMap =
653 std::map<std::string, 653 std::map<std::string,
654 base::Callback<std::unique_ptr<mojo::ShellClient>()>>; 654 base::Callback<std::unique_ptr<shell::ShellClient>()>>;
655 655
656 // 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
657 // browser's global Mojo shell. 657 // browser's global Mojo shell.
658 virtual void RegisterInProcessMojoApplications( 658 virtual void RegisterInProcessMojoApplications(
659 StaticMojoApplicationMap* apps) {} 659 StaticMojoApplicationMap* apps) {}
660 660
661 using OutOfProcessMojoApplicationMap = std::map<std::string, base::string16>; 661 using OutOfProcessMojoApplicationMap = std::map<std::string, base::string16>;
662 662
663 // 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
664 // 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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 // Allows an embedder to provide its own ExternalVideoSurfaceContainer 753 // Allows an embedder to provide its own ExternalVideoSurfaceContainer
754 // implementation. Return nullptr to disable external surface video. 754 // implementation. Return nullptr to disable external surface video.
755 virtual ExternalVideoSurfaceContainer* 755 virtual ExternalVideoSurfaceContainer*
756 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents); 756 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents);
757 #endif 757 #endif
758 }; 758 };
759 759
760 } // namespace content 760 } // namespace content
761 761
762 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 762 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « content/public/browser/browser_context.h ('k') | content/public/common/mojo_shell_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698