Remove extraneous namespaces

mojo/examples/nesting_app/nesting_app.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/examples/window_manager/window_manager.mojom.h"
 #include "mojo/public/cpp/application/application_connection.h"
@@ skipping 12 matching lines @@
 
 namespace mojo {
 namespace examples {
 
 namespace {
 const char kEmbeddedAppURL[] = "mojo:mojo_embedded_app";
 }
 
 class NestingApp;
 
-class Navigator : public InterfaceImpl<navigation::Navigator> {
+class NavigatorImpl : public InterfaceImpl<Navigator> {
  public:
-  explicit Navigator(NestingApp* app) : app_(app) {}
+  explicit NavigatorImpl(NestingApp* app) : app_(app) {}
 
  private:
   virtual void Navigate(
       uint32 node_id,
-      navigation::NavigationDetailsPtr navigation_details,
-      navigation::ResponseDetailsPtr response_details) OVERRIDE;
+      NavigationDetailsPtr navigation_details,
+      ResponseDetailsPtr response_details) OVERRIDE;
 
   NestingApp* app_;
-  DISALLOW_COPY_AND_ASSIGN(Navigator);
+  DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
 };
 
 // An app that embeds another app.
 // TODO(davemoore): Is this the right name?
-class NestingApp : public ApplicationDelegate,
-                   public ViewManagerDelegate,
-                   public ViewObserver,
-                   public NodeObserver,
-                   public InterfaceFactoryWithContext<Navigator, NestingApp> {
+class NestingApp
+    : public ApplicationDelegate,
+      public ViewManagerDelegate,
+      public ViewObserver,
+      public NodeObserver,
+      public InterfaceFactoryWithContext<NavigatorImpl, NestingApp> {
  public:
   NestingApp()
       : InterfaceFactoryWithContext(this),
         nested_(NULL),
         view_manager_client_factory_(this) {}
   virtual ~NestingApp() {}
 
   void set_color(const std::string& color) { color_ = color; }
 
   void NavigateChild() {
     if (!color_.empty() && nested_) {
-      navigation::NavigationDetailsPtr details(
-          navigation::NavigationDetails::New());
+      NavigationDetailsPtr details(NavigationDetails::New());
       details->url =
           base::StringPrintf("%s/%s", kEmbeddedAppURL, color_.c_str());
-      navigation::ResponseDetailsPtr response_details(
-          navigation::ResponseDetails::New());
+      ResponseDetailsPtr response_details(ResponseDetails::New());
       navigator_->Navigate(
           nested_->id(), details.Pass(), response_details.Pass());
     }
   }
 
  private:
   // Overridden from ApplicationImpl:
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       MOJO_OVERRIDE {
     connection->ConnectToService(&window_manager_);
@@ skipping 34 matching lines @@
   }
 
   // Overridden from NodeObserver:
   virtual void OnNodeDestroyed(Node* node) OVERRIDE {
     // TODO(beng): reap views & child nodes.
     nested_ = NULL;
   }
 
   std::string color_;
   Node* nested_;
-  navigation::NavigatorPtr navigator_;
+  NavigatorPtr navigator_;
   IWindowManagerPtr window_manager_;
   ViewManagerClientFactory view_manager_client_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NestingApp);
 };
 
-void Navigator::Navigate(uint32 node_id,
-                         navigation::NavigationDetailsPtr navigation_details,
-                         navigation::ResponseDetailsPtr response_details) {
+void NavigatorImpl::Navigate(uint32 node_id,
+                             NavigationDetailsPtr navigation_details,
+                             ResponseDetailsPtr response_details) {
   GURL url(navigation_details->url.To<std::string>());
   if (!url.is_valid()) {
     LOG(ERROR) << "URL is invalid.";
     return;
   }
   app_->set_color(url.path().substr(1));
   app_->NavigateChild();
 }
 
 }  // namespace examples
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new examples::NestingApp;
 }
 
 }  // namespace mojo