Revert of Mandoline UI Process: Update namespaces and file names

components/mus/display_manager.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 COMPONENTS_MUS_DISPLAY_MANAGER_H_
 #define COMPONENTS_MUS_DISPLAY_MANAGER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 13 matching lines @@
 }  // namespace cc
 
 namespace gles2 {
 class GpuState;
 }  // namespace gles2
 
 namespace mojo {
 class ApplicationImpl;
 }  // namespace mojo
 
+namespace surfaces {
+class SurfacesScheduler;
+class SurfacesState;
+}  // namespace surfaces
+
 namespace ui {
 class PlatformWindow;
 struct TextInputState;
 }  // namespace ui
 
-namespace mus {
+namespace view_manager {
 
 class DisplayManagerFactory;
 class EventDispatcher;
 class ServerView;
-class SurfacesScheduler;
-class SurfacesState;
 
 // DisplayManager is used to connect the root ServerView to a display.
 class DisplayManager {
  public:
   virtual ~DisplayManager() {}
 
   static DisplayManager* Create(
       bool is_headless,
       mojo::ApplicationImpl* app_impl,
-      const scoped_refptr<GpuState>& gpu_state,
-      const scoped_refptr<SurfacesState>& surfaces_state);
+      const scoped_refptr<gles2::GpuState>& gpu_state,
+      const scoped_refptr<surfaces::SurfacesState>& surfaces_state);
 
   virtual void Init(DisplayManagerDelegate* delegate) = 0;
 
   // Schedules a paint for the specified region in the coordinates of |view|.
   virtual void SchedulePaint(const ServerView* view,
                              const gfx::Rect& bounds) = 0;
 
   virtual void SetViewportSize(const gfx::Size& size) = 0;
 
   virtual void SetTitle(const base::string16& title) = 0;
@@ skipping 12 matching lines @@
  private:
   // Static factory instance (always NULL for non-test).
   static DisplayManagerFactory* factory_;
 };
 
 // DisplayManager implementation that connects to the services necessary to
 // actually display.
 class DefaultDisplayManager : public DisplayManager,
                               public ui::PlatformWindowDelegate {
  public:
-  DefaultDisplayManager(bool is_headless,
-                        mojo::ApplicationImpl* app_impl,
-                        const scoped_refptr<GpuState>& gpu_state,
-                        const scoped_refptr<SurfacesState>& surfaces_state);
+  DefaultDisplayManager(
+      bool is_headless,
+      mojo::ApplicationImpl* app_impl,
+      const scoped_refptr<gles2::GpuState>& gpu_state,
+      const scoped_refptr<surfaces::SurfacesState>& surfaces_state);
   ~DefaultDisplayManager() override;
 
   // DisplayManager:
   void Init(DisplayManagerDelegate* delegate) override;
   void SchedulePaint(const ServerView* view, const gfx::Rect& bounds) override;
   void SetViewportSize(const gfx::Size& size) override;
   void SetTitle(const base::string16& title) override;
   const mojo::ViewportMetrics& GetViewportMetrics() override;
   void UpdateTextInputState(const ui::TextInputState& state) override;
   void SetImeVisibility(bool visible) override;
@@ skipping 11 matching lines @@
   void OnCloseRequest() override;
   void OnClosed() override;
   void OnWindowStateChanged(ui::PlatformWindowState new_state) override;
   void OnLostCapture() override;
   void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget,
                                     float device_pixel_ratio) override;
   void OnActivationChanged(bool active) override;
 
   bool is_headless_;
   mojo::ApplicationImpl* app_impl_;
-  scoped_refptr<GpuState> gpu_state_;
-  scoped_refptr<SurfacesState> surfaces_state_;
+  scoped_refptr<gles2::GpuState> gpu_state_;
+  scoped_refptr<surfaces::SurfacesState> surfaces_state_;
   DisplayManagerDelegate* delegate_;
 
   mojo::ViewportMetrics metrics_;
   gfx::Rect dirty_rect_;
   base::Timer draw_timer_;
   bool frame_pending_;
 
-  scoped_ptr<TopLevelDisplayClient> top_level_display_client_;
+  scoped_ptr<surfaces::TopLevelDisplayClient> top_level_display_client_;
   scoped_ptr<ui::PlatformWindow> platform_window_;
 
   base::WeakPtrFactory<DefaultDisplayManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager);
 };
 
-}  // namespace mus
+}  // namespace view_manager
 
 #endif  // COMPONENTS_MUS_DISPLAY_MANAGER_H_