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

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

Issue 1382383002: Revert of Provide the DeviceManager service to the renderer directly, no app. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@interface_permission
Patch Set: Created 5 years, 2 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 (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 <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 // Allows to register browser Mojo services exposed through the 615 // Allows to register browser Mojo services exposed through the
616 // RenderProcessHost. 616 // RenderProcessHost.
617 virtual void RegisterRenderProcessMojoServices(ServiceRegistry* registry) {} 617 virtual void RegisterRenderProcessMojoServices(ServiceRegistry* registry) {}
618 618
619 // Allows to register browser Mojo services exposed through the 619 // Allows to register browser Mojo services exposed through the
620 // FrameMojoShell. 620 // FrameMojoShell.
621 virtual void RegisterFrameMojoShellServices( 621 virtual void RegisterFrameMojoShellServices(
622 ServiceRegistry* registry, 622 ServiceRegistry* registry,
623 RenderFrameHost* render_frame_host) {} 623 RenderFrameHost* render_frame_host) {}
624 624
625 // Allows to register browser Mojo services exposed through the
626 // RenderFrameHost.
627 virtual void RegisterRenderFrameMojoServices(
628 ServiceRegistry* registry,
629 RenderFrameHost* render_frame_host) {}
630
631 using StaticMojoApplicationMap = 625 using StaticMojoApplicationMap =
632 std::map<GURL, base::Callback<scoped_ptr<mojo::ApplicationDelegate>()>>; 626 std::map<GURL, base::Callback<scoped_ptr<mojo::ApplicationDelegate>()>>;
633 627
634 // Registers Mojo applications to be loaded in the browser process by the 628 // Registers Mojo applications to be loaded in the browser process by the
635 // browser's global Mojo shell. 629 // browser's global Mojo shell.
636 virtual void RegisterInProcessMojoApplications( 630 virtual void RegisterInProcessMojoApplications(
637 StaticMojoApplicationMap* apps) {} 631 StaticMojoApplicationMap* apps) {}
638 632
639 using OutOfProcessMojoApplicationMap = std::map<GURL, base::string16>; 633 using OutOfProcessMojoApplicationMap = std::map<GURL, base::string16>;
640 634
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
716 // Allows an embedder to provide its own ExternalVideoSurfaceContainer 710 // Allows an embedder to provide its own ExternalVideoSurfaceContainer
717 // implementation. Return nullptr to disable external surface video. 711 // implementation. Return nullptr to disable external surface video.
718 virtual ExternalVideoSurfaceContainer* 712 virtual ExternalVideoSurfaceContainer*
719 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents); 713 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents);
720 #endif 714 #endif
721 }; 715 };
722 716
723 } // namespace content 717 } // namespace content
724 718
725 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 719 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698