Remove extraneous namespaces

mojo/examples/media_viewer/media_viewer.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 <map>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 167 matching lines @@
       }
     }
   }
 
   Delegate* delegate_;
   views::Button* buttons_[CONTROL_COUNT];
 
   DISALLOW_COPY_AND_ASSIGN(ControlPanel);
 };
 
-class NavigatorImpl : public InterfaceImpl<navigation::Navigator> {
+class NavigatorImpl : public InterfaceImpl<Navigator> {
  public:
   explicit NavigatorImpl(MediaViewer* viewer) : viewer_(viewer) {}
   virtual ~NavigatorImpl() {}
 
  private:
-  // Overridden from navigation::Navigate:
+  // Overridden from Navigator:
   virtual void Navigate(
       uint32_t node_id,
-      navigation::NavigationDetailsPtr navigation_details,
-      navigation::ResponseDetailsPtr response_details) OVERRIDE;
+      NavigationDetailsPtr navigation_details,
+      ResponseDetailsPtr response_details) OVERRIDE;
 
   MediaViewer* viewer_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
 };
 
 class MediaViewer
     : public ApplicationDelegate,
       public ViewManagerDelegate,
       public ControlPanel::Delegate,
@@ skipping 12 matching lines @@
     handler_map_["image/png"] = "mojo:mojo_png_viewer";
   }
 
   virtual ~MediaViewer() {
     if (root_node_)
       root_node_->RemoveObserver(this);
   }
 
   void Navigate(
       uint32_t node_id,
-      navigation::NavigationDetailsPtr navigation_details,
-      navigation::ResponseDetailsPtr response_details) {
+      NavigationDetailsPtr navigation_details,
+      ResponseDetailsPtr response_details) {
     // TODO(yzshen): This shouldn't be needed once FIFO is ready.
     if (!view_manager_) {
       pending_navigate_request_.reset(new PendingNavigateRequest);
       pending_navigate_request_->node_id = node_id;
       pending_navigate_request_->navigation_details = navigation_details.Pass();
       pending_navigate_request_->response_details = response_details.Pass();
 
       return;
     }
 
     std::string handler = GetHandlerForContentType(
         response_details->response->mime_type);
     if (handler.empty())
       return;
 
     content_node_->Embed(handler);
 
     if (navigation_details) {
-      navigation::NavigatorPtr navigator;
+      NavigatorPtr navigator;
       app_->ConnectToService(handler, &navigator);
       navigator->Navigate(content_node_->id(), navigation_details.Pass(),
                           response_details.Pass());
     }
 
     // TODO(yzshen): determine the set of controls to show based on what
     // interfaces the embedded app provides.
     app_->ConnectToService(handler, &zoomable_media_);
   }
 
  private:
   typedef std::map<std::string, std::string> HandlerMap;
 
   struct PendingNavigateRequest {
     uint32_t node_id;
-    navigation::NavigationDetailsPtr navigation_details;
-    navigation::ResponseDetailsPtr response_details;
+    NavigationDetailsPtr navigation_details;
+    ResponseDetailsPtr response_details;
   };
 
 
   // Overridden from ApplicationDelegate:
   virtual void Initialize(ApplicationImpl* app) OVERRIDE {
     app_ = app;
     views_init_.reset(new ViewsInit);
   }
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
@@ skipping 88 matching lines @@
   ControlPanel control_panel_;
   ZoomableMediaPtr zoomable_media_;
   HandlerMap handler_map_;
   scoped_ptr<PendingNavigateRequest> pending_navigate_request_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaViewer);
 };
 
 void NavigatorImpl::Navigate(
     uint32_t node_id,
-    navigation::NavigationDetailsPtr navigation_details,
-    navigation::ResponseDetailsPtr response_details) {
+    NavigationDetailsPtr navigation_details,
+    ResponseDetailsPtr response_details) {
   viewer_->Navigate(node_id, navigation_details.Pass(),
                     response_details.Pass());
 }
 
 }  // namespace examples
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new examples::MediaViewer;
 }
 
 }  // namespace mojo