Revert of Mandoline UI Process: Update namespaces and file names

components/mus/display_manager.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 "components/mus/display_manager.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/render_pass.h"
@@ skipping 26 matching lines @@
 #include "ui/platform_window/win/win_window.h"
 #elif defined(USE_X11)
 #include "ui/platform_window/x11/x11_window.h"
 #elif defined(OS_ANDROID)
 #include "ui/platform_window/android/platform_window_android.h"
 #endif
 
 using mojo::Rect;
 using mojo::Size;
 
-namespace mus {
+namespace view_manager {
 namespace {
 
 void DrawViewTree(cc::RenderPass* pass,
                   const ServerView* view,
                   const gfx::Vector2d& parent_to_root_origin_offset,
                   float opacity) {
   if (!view->visible())
     return;
 
   const gfx::Rect absolute_bounds =
@@ skipping 34 matching lines @@
 
 }  // namespace
 
 // static
 DisplayManagerFactory* DisplayManager::factory_ = nullptr;
 
 // static
 DisplayManager* 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) {
   if (factory_) {
     return factory_->CreateDisplayManager(is_headless, app_impl, gpu_state,
                                           surfaces_state);
   }
   return new DefaultDisplayManager(is_headless, app_impl, gpu_state,
                                    surfaces_state);
 }
 
 DefaultDisplayManager::DefaultDisplayManager(
     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)
     : is_headless_(is_headless),
       app_impl_(app_impl),
       gpu_state_(gpu_state),
       surfaces_state_(surfaces_state),
       delegate_(nullptr),
       draw_timer_(false, false),
       frame_pending_(false),
       weak_factory_(this) {
   metrics_.size_in_pixels = mojo::Size::New();
   metrics_.size_in_pixels->width = 800;
@@ skipping 207 matching lines @@
 
 void DefaultDisplayManager::OnWindowStateChanged(
     ui::PlatformWindowState new_state) {}
 
 void DefaultDisplayManager::OnLostCapture() {}
 
 void DefaultDisplayManager::OnAcceleratedWidgetAvailable(
     gfx::AcceleratedWidget widget,
     float device_pixel_ratio) {
   if (widget != gfx::kNullAcceleratedWidget) {
-    top_level_display_client_.reset(
-        new TopLevelDisplayClient(widget, gpu_state_, surfaces_state_));
+    top_level_display_client_.reset(new surfaces::TopLevelDisplayClient(
+        widget, gpu_state_, surfaces_state_));
   }
   UpdateMetrics(metrics_.size_in_pixels.To<gfx::Size>(), device_pixel_ratio);
 }
 
 void DefaultDisplayManager::OnActivationChanged(bool active) {}
 
-}  // namespace mus
+}  // namespace view_manager