Move HTMLViewer out of mojo namespace

mojo/services/html_viewer/weblayertreeview_impl.h

 // 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.
 
 #ifndef MOJO_SERVICES_HTML_VIEWER_WEBLAYERTREEVIEW_IMPL_H_
 #define MOJO_SERVICES_HTML_VIEWER_WEBLAYERTREEVIEW_IMPL_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 12 matching lines @@
 namespace blink {
 class WebWidget;
 }
 
 namespace cc {
 class LayerTreeHost;
 }
 
 namespace mojo {
 class View;
+}
+
+namespace html_viewer {
 
 class WebLayerTreeViewImpl : public blink::WebLayerTreeView,
                              public cc::LayerTreeHostClient,
-                             public OutputSurfaceMojoClient {
+                             public mojo::OutputSurfaceMojoClient {
  public:
   WebLayerTreeViewImpl(
       scoped_refptr<base::MessageLoopProxy> compositor_message_loop_proxy,
-      SurfacesServicePtr surfaces_service,
-      GpuPtr gpu_service);
+      mojo::SurfacesServicePtr surfaces_service,
+      mojo::GpuPtr gpu_service);
   virtual ~WebLayerTreeViewImpl();
 
   void set_widget(blink::WebWidget* widget) { widget_ = widget; }
-  void set_view(View* view) { view_ = view; }
+  void set_view(mojo::View* view) { view_ = view; }
 
   // cc::LayerTreeHostClient implementation.
   void WillBeginMainFrame(int frame_id) override;
   void DidBeginMainFrame() override;
   void BeginMainFrame(const cc::BeginFrameArgs& args) override;
   void Layout() override;
   void ApplyViewportDeltas(const gfx::Vector2d& inner_delta,
                            const gfx::Vector2d& outer_delta,
                            const gfx::Vector2dF& elastic_overscroll_delta,
                            float page_scale,
@@ skipping 50 matching lines @@
   virtual void setShowFPSCounter(bool) {}
   virtual void setShowPaintRects(bool) {}
   virtual void setShowDebugBorders(bool) {}
   virtual void setContinuousPaintingEnabled(bool) {}
   virtual void setShowScrollBottleneckRects(bool) {}
 
   // OutputSurfaceMojoClient implementation.
   void DidCreateSurface(cc::SurfaceId id) override;
 
  private:
-  void OnSurfaceConnectionCreated(SurfacePtr surface, uint32_t id_namespace);
+  void OnSurfaceConnectionCreated(mojo::SurfacePtr surface,
+                                  uint32_t id_namespace);
   void DidCreateSurfaceOnMainThread(cc::SurfaceId id);
 
   // widget_ and view_ will outlive us.
   blink::WebWidget* widget_;
-  View* view_;
+  mojo::View* view_;
   scoped_ptr<cc::LayerTreeHost> layer_tree_host_;
-  SurfacesServicePtr surfaces_service_;
+  mojo::SurfacesServicePtr surfaces_service_;
   scoped_ptr<cc::OutputSurface> output_surface_;
-  GpuPtr gpu_service_;
+  mojo::GpuPtr gpu_service_;
   scoped_refptr<base::SingleThreadTaskRunner>
       main_thread_compositor_task_runner_;
   base::WeakPtr<WebLayerTreeViewImpl> main_thread_bound_weak_ptr_;
 
   base::WeakPtrFactory<WebLayerTreeViewImpl> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(WebLayerTreeViewImpl);
 };
 
-}  // namespace mojo
+}  // namespace html_viewer
 
 #endif  // MOJO_SERVICES_HTML_VIEWER_WEBLAYERTREEVIEW_IMPL_H_