Move HTMLViewer out of mojo namespace

mojo/services/html_viewer/html_document.h

Index: mojo/services/html_viewer/html_document.h
diff --git a/mojo/services/html_viewer/html_document.h b/mojo/services/html_viewer/html_document.h
index 2ec72da4bf00995a2efaa5a8ffc4f09c4f905893..516a17e5d6a2c942e95f4e46c613475d0e6bf596 100644
--- a/mojo/services/html_viewer/html_document.h
+++ b/mojo/services/html_viewer/html_document.h
@@ -29,19 +29,22 @@ class MessageLoopProxy;
 }
 
 namespace mojo {
-
-class AxProviderImpl;
-class WebMediaPlayerFactory;
 class ViewManager;
 class View;
+}
+
+namespace html_viewer {
+
+class AxProviderImpl;
 class WebLayerTreeViewImpl;
+class WebMediaPlayerFactory;
 
 // A view for a single HTML document.
 class HTMLDocument : public blink::WebViewClient,
                      public blink::WebFrameClient,
-                     public ViewManagerDelegate,
-                     public ViewObserver,
-                     public InterfaceFactory<AxProvider> {
+                     public mojo::ViewManagerDelegate,
+                     public mojo::ViewObserver,
+                     public mojo::InterfaceFactory<mojo::AxProvider> {
  public:
   // Load a new HTMLDocument with |response|.
   //
@@ -51,9 +54,9 @@ class HTMLDocument : public blink::WebViewClient,
   // request ViewManagerClient.
   //
   // |shell| is the Shell connection for this mojo::Application.
-  HTMLDocument(ServiceProviderPtr provider,
-               URLResponsePtr response,
-               Shell* shell,
+  HTMLDocument(mojo::ServiceProviderPtr provider,
+               mojo::URLResponsePtr response,
+               mojo::Shell* shell,
                scoped_refptr<base::MessageLoopProxy> compositor_thread,
                WebMediaPlayerFactory* web_media_player_factory);
   virtual ~HTMLDocument();
@@ -96,33 +99,34 @@ class HTMLDocument : public blink::WebViewClient,
                                      blink::WebHistoryCommitType commit_type);
 
   // ViewManagerDelegate methods:
-  void OnEmbed(ViewManager* view_manager,
-               View* root,
-               ServiceProviderImpl* embedee_service_provider_impl,
-               scoped_ptr<ServiceProvider> embedder_service_provider) override;
-  void OnViewManagerDisconnected(ViewManager* view_manager) override;
+  void OnEmbed(
+      mojo::ViewManager* view_manager,
+      mojo::View* root,
+      mojo::ServiceProviderImpl* embedee_service_provider_impl,
+      scoped_ptr<mojo::ServiceProvider> embedder_service_provider) override;
+  void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override;
 
   // ViewObserver methods:
-  void OnViewBoundsChanged(View* view,
-                           const Rect& old_bounds,
-                           const Rect& new_bounds) override;
-  void OnViewDestroyed(View* view) override;
-  void OnViewInputEvent(View* view, const EventPtr& event) override;
+  void OnViewBoundsChanged(mojo::View* view,
+                           const mojo::Rect& old_bounds,
+                           const mojo::Rect& new_bounds) override;
+  void OnViewDestroyed(mojo::View* view) override;
+  void OnViewInputEvent(mojo::View* view, const mojo::EventPtr& event) override;
 
   // InterfaceFactory<AxProvider>
-  void Create(ApplicationConnection* connection,
-              InterfaceRequest<AxProvider> request) override;
+  void Create(mojo::ApplicationConnection* connection,
+              mojo::InterfaceRequest<mojo::AxProvider> request) override;
 
-  void Load(URLResponsePtr response);
+  void Load(mojo::URLResponsePtr response);
 
-  URLResponsePtr response_;
-  ServiceProviderImpl exported_services_;
-  scoped_ptr<ServiceProvider> embedder_service_provider_;
-  Shell* shell_;
-  LazyInterfacePtr<NavigatorHost> navigator_host_;
+  mojo::URLResponsePtr response_;
+  mojo::ServiceProviderImpl exported_services_;
+  scoped_ptr<mojo::ServiceProvider> embedder_service_provider_;
+  mojo::Shell* shell_;
+  mojo::LazyInterfacePtr<mojo::NavigatorHost> navigator_host_;
   blink::WebView* web_view_;
-  View* root_;
-  ViewManagerClientFactory view_manager_client_factory_;
+  mojo::View* root_;
+  mojo::ViewManagerClientFactory view_manager_client_factory_;
   scoped_ptr<WebLayerTreeViewImpl> web_layer_tree_view_impl_;
   scoped_refptr<base::MessageLoopProxy> compositor_thread_;
   WebMediaPlayerFactory* web_media_player_factory_;
@@ -133,6 +137,6 @@ class HTMLDocument : public blink::WebViewClient,
   DISALLOW_COPY_AND_ASSIGN(HTMLDocument);
 };
 
-}  // namespace mojo
+}  // namespace html_viewer
 
 #endif  // MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_