commit bd07e3aa605626017058a02c50ffbe267b81aef3
author Viet-Trung Luu <viettrungluu@chromium.org> Thu Apr 09 12:43:29 2015 -0700
committer Viet-Trung Luu <viettrungluu@chromium.org> Thu Apr 09 12:43:29 2015 -0700
tree e5afd9f1f17a8eb8c7acc13f04b0058743e6ab7f
parent 86e557338b238f0ad792a812a7821bc30b05a222

Remove mojo:: part of mojo::shell:: nested namespace in //shell.

R=jamesr@chromium.org

Review URL: https://codereview.chromium.org/1067173003

shell/child_process_host.h

diff --git a/shell/child_process_host.h b/shell/child_process_host.h
index c537615..86a6afa 100644
--- a/shell/child_process_host.h
+++ b/shell/child_process_host.h
@@ -15,7 +15,6 @@
 #include "mojo/public/cpp/bindings/error_handler.h"
 #include "shell/child_controller.mojom.h"
 
-namespace mojo {
 namespace shell {
 
 class Context;
@@ -26,7 +25,7 @@
 //
 // This class is not thread-safe. It should be created/used/destroyed on a
 // single thread.
-class ChildProcessHost : public ErrorHandler {
+class ChildProcessHost : public mojo::ErrorHandler {
  public:
   explicit ChildProcessHost(Context* context);
   ~ChildProcessHost() override;
@@ -52,9 +51,9 @@
   // Like |ChildController::StartApp()|, but with one difference:
   // |on_app_complete| will *always* get called, even on connection error (or
   // even if the child process failed to start at all).
-  void StartApp(const String& app_path,
+  void StartApp(const mojo::String& app_path,
                 bool clean_app_path,
-                InterfaceRequest<Application> application_request,
+                mojo::InterfaceRequest<mojo::Application> application_request,
                 const ChildController::StartAppCallback& on_app_complete);
   void ExitNow(int32_t exit_code);
 
@@ -63,21 +62,21 @@
   virtual void DidStart(bool success);
 
  private:
-  // Callback for |embedder::CreateChannel()|.
-  void DidCreateChannel(embedder::ChannelInfo* channel_info);
+  // Callback for |mojo::embedder::CreateChannel()|.
+  void DidCreateChannel(mojo::embedder::ChannelInfo* channel_info);
 
   bool DoLaunch();
 
   void AppCompleted(int32_t result);
 
-  // |ErrorHandler| methods:
+  // |mojo::ErrorHandler| methods:
   void OnConnectionError() override;
 
   Context* const context_;
-  embedder::PlatformChannelPair platform_channel_pair_;
+  mojo::embedder::PlatformChannelPair platform_channel_pair_;
 
   ChildControllerPtr controller_;
-  embedder::ChannelInfo* channel_info_;
+  mojo::embedder::ChannelInfo* channel_info_;
   ChildController::StartAppCallback on_app_complete_;
 
   base::Process child_process_;
@@ -86,6 +85,5 @@
 };
 
 }  // namespace shell
-}  // namespace mojo
 
 #endif  // SHELL_CHILD_PROCESS_HOST_H_