Remove extraneous namespaces

mojo/examples/embedded_app/embedded_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/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "mojo/public/cpp/application/application_connection.h"
@@ skipping 17 matching lines @@
 using mojo::view_manager::View;
 using mojo::view_manager::ViewManager;
 using mojo::view_manager::ViewManagerDelegate;
 using mojo::view_manager::ViewManagerClientFactory;
 using mojo::view_manager::ViewObserver;
 
 namespace mojo {
 namespace examples {
 class EmbeddedApp;
 
-class Navigator : public InterfaceImpl<navigation::Navigator> {
+class Navigator : public InterfaceImpl<mojo::Navigator> {

[darin (slow to review), 2014/07/25 03:37:29]

nit: this class should really be named NavigatorImpl, right?

  public:
   explicit Navigator(EmbeddedApp* 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;
 
   EmbeddedApp* app_;
   DISALLOW_COPY_AND_ASSIGN(Navigator);
 };
 
 class EmbeddedApp : public ApplicationDelegate,
                     public ViewManagerDelegate,
                     public ViewObserver,
                     public NodeObserver,
                     public InterfaceFactoryWithContext<Navigator, EmbeddedApp> {
@@ skipping 39 matching lines @@
     ProcessPendingNodeColor(root->id());
   }
   virtual void OnViewManagerDisconnected(ViewManager* view_manager) OVERRIDE {
     base::MessageLoop::current()->Quit();
   }
 
   // Overridden from ViewObserver:
   virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE {
     if (event->action == EVENT_TYPE_MOUSE_RELEASED) {
       if (event->flags & EVENT_FLAGS_LEFT_MOUSE_BUTTON) {
-        navigation::NavigationDetailsPtr nav_details(
-            navigation::NavigationDetails::New());
+        NavigationDetailsPtr nav_details(NavigationDetails::New());
         nav_details->url = "http://www.aaronboodman.com/z_dropbox/test.html";
         navigator_host_->RequestNavigate(view->node()->id(),
-                                         navigation::TARGET_SOURCE_NODE,
+                                         TARGET_SOURCE_NODE,
                                          nav_details.Pass());
       }
     }
   }
 
   // Overridden from NodeObserver:
   virtual void OnNodeActiveViewChanged(Node* node,
                                        View* old_view,
                                        View* new_view) OVERRIDE {
     if (new_view == 0)
@@ skipping 14 matching lines @@
 
     PendingNodeColors::iterator color = pending_node_colors_.find(node_id);
     if (color == pending_node_colors_.end())
       return;
 
     root->second->active_view()->SetColor(color->second);
     pending_node_colors_.erase(color);
   }
 
   view_manager::ViewManager* view_manager_;
-  navigation::NavigatorHostPtr navigator_host_;
+  NavigatorHostPtr navigator_host_;
   std::map<Node*, View*> views_to_reap_;
   ViewManagerClientFactory view_manager_client_factory_;
 
   typedef std::map<view_manager::Id, Node*> RootMap;
   RootMap roots_;
 
   // We can receive navigations for nodes we don't have yet.
   typedef std::map<uint32, SkColor> PendingNodeColors;
   PendingNodeColors pending_node_colors_;
 
   DISALLOW_COPY_AND_ASSIGN(EmbeddedApp);
 };
 
 void Navigator::Navigate(uint32 node_id,
-                         navigation::NavigationDetailsPtr navigation_details,
-                         navigation::ResponseDetailsPtr response_details) {
+                         NavigationDetailsPtr navigation_details,
+                         ResponseDetailsPtr response_details) {
   GURL url(navigation_details->url.To<std::string>());
   if (!url.is_valid()) {
     LOG(ERROR) << "URL is invalid.";
     return;
   }
   // TODO(aa): Verify new URL is same origin as current origin.
   SkColor color = 0x00;
   if (!base::HexStringToUInt(url.path().substr(1), &color)) {
     LOG(ERROR) << "Invalid URL, path not convertible to integer";
     return;
   }
   app_->SetNodeColor(node_id, color);
 }
 
 }  // namespace examples
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new examples::EmbeddedApp;
 }
 
 }  // namespace mojo