Nukes view_manager namespace

mojo/services/html_viewer/html_document_view.h

Index: mojo/services/html_viewer/html_document_view.h
diff --git a/mojo/services/html_viewer/html_document_view.h b/mojo/services/html_viewer/html_document_view.h
index 99131a1573df69b9002b34db1d8423c051ef2bf5..41b3c6541079e80a1558565f960e4d1e17694fa8 100644
--- a/mojo/services/html_viewer/html_document_view.h
+++ b/mojo/services/html_viewer/html_document_view.h
@@ -18,23 +18,21 @@
 
 namespace mojo {
 
-namespace view_manager {
 class Node;
 class ViewManager;
 class View;
-}
 
 // A view for a single HTML document.
 class HTMLDocumentView : public blink::WebViewClient,
                          public blink::WebFrameClient,
-                         public view_manager::ViewObserver,
-                         public view_manager::NodeObserver {
+                         public ViewObserver,
+                         public NodeObserver {
  public:
   HTMLDocumentView(ServiceProvider* service_provider,
-                   view_manager::ViewManager* view_manager);
+                   ViewManager* view_manager);
   virtual ~HTMLDocumentView();
 
-  void AttachToNode(view_manager::Node* node);
+  void AttachToNode(Node* node);
 
   void Load(URLResponsePtr response);
 
@@ -63,21 +61,20 @@ class HTMLDocumentView : public blink::WebViewClient,
       blink::WebHistoryCommitType commit_type);
 
   // ViewObserver methods:
-  virtual void OnViewInputEvent(view_manager::View* view,
-                                const EventPtr& event) OVERRIDE;
+  virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE;
 
   // NodeObserver methods:
-  virtual void OnNodeBoundsChanged(view_manager::Node* node,
+  virtual void OnNodeBoundsChanged(Node* node,
                                    const gfx::Rect& old_bounds,
                                    const gfx::Rect& new_bounds) OVERRIDE;
-  virtual void OnNodeDestroyed(view_manager::Node* node) OVERRIDE;
+  virtual void OnNodeDestroyed(Node* node) OVERRIDE;
 
   void Repaint();
 
-  view_manager::ViewManager* view_manager_;
-  view_manager::View* view_;
+  ViewManager* view_manager_;
+  View* view_;
   blink::WebView* web_view_;
-  view_manager::Node* root_;
+  Node* root_;
   bool repaint_pending_;
   LazyInterfacePtr<navigation::NavigatorHost> navigator_host_;