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

Unified Diff: content/child/process_control_impl.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/child/mojo/mojo_application.cc ('k') | content/child/process_control_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/process_control_impl.h
diff --git a/content/child/process_control_impl.h b/content/child/process_control_impl.h
index 85910d323f6257c3cf92e30ed22921bdd34e8cc2..2bf4e5f3d38fc8d3f5aaa1ea4a8903cae143d8f5 100644
--- a/content/child/process_control_impl.h
+++ b/content/child/process_control_impl.h
@@ -12,11 +12,9 @@
#include "mojo/public/cpp/bindings/interface_request.h"
#include "services/shell/public/interfaces/shell_client.mojom.h"
-namespace mojo {
namespace shell {
class Loader;
} // namespace shell
-} // namespace mojo
namespace content {
@@ -26,7 +24,7 @@ class ProcessControlImpl : public mojom::ProcessControl {
ProcessControlImpl();
~ProcessControlImpl() override;
- using NameToLoaderMap = std::map<std::string, mojo::shell::Loader*>;
+ using NameToLoaderMap = std::map<std::string, shell::Loader*>;
// Registers Mojo loaders for names.
virtual void RegisterLoaders(NameToLoaderMap* name_to_loader_map) = 0;
@@ -34,7 +32,7 @@ class ProcessControlImpl : public mojom::ProcessControl {
// ProcessControl:
void LoadApplication(
const mojo::String& name,
- mojo::InterfaceRequest<mojo::shell::mojom::ShellClient> request,
+ mojo::InterfaceRequest<shell::mojom::ShellClient> request,
const LoadApplicationCallback& callback) override;
private:
« no previous file with comments | « content/child/mojo/mojo_application.cc ('k') | content/child/process_control_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698