Mandoline UI Process: Update namespaces and file names

components/mus/mus_app.cc

Index: components/mus/mus_app.cc
diff --git a/components/mus/view_manager_app.cc b/components/mus/mus_app.cc
similarity index 75%
rename from components/mus/view_manager_app.cc
rename to components/mus/mus_app.cc
index d83894ddcf1f0ab80d9d7795f5cb3275d170c062..e33fa18664b48dd4997cf462a23450ad18e68def 100644
--- a/components/mus/view_manager_app.cc
+++ b/components/mus/mus_app.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mus/view_manager_app.h"
+#include "components/mus/mus_app.h"
 
 #include "base/command_line.h"
 #include "base/stl_util.h"
@@ -35,28 +35,29 @@ using mojo::Gpu;
 using mojo::InterfaceRequest;
 using mojo::ViewTreeHostFactory;
 
-namespace view_manager {
+namespace mus {
 
-ViewManagerApp::ViewManagerApp() : app_impl_(nullptr), is_headless_(false) {}
+MandolineUIServicesApp::MandolineUIServicesApp()
+    : app_impl_(nullptr), is_headless_(false) {}
 
-ViewManagerApp::~ViewManagerApp() {
+MandolineUIServicesApp::~MandolineUIServicesApp() {
   if (gpu_state_)
     gpu_state_->StopControlThread();
   // Destroy |connection_manager_| first, since it depends on |event_source_|.
   connection_manager_.reset();
 }
 
-void ViewManagerApp::Initialize(ApplicationImpl* app) {
+void MandolineUIServicesApp::Initialize(ApplicationImpl* app) {
   app_impl_ = app;
   tracing_.Initialize(app);
-  surfaces_state_ = new surfaces::SurfacesState;
+  surfaces_state_ = new SurfacesState;
 
 #if !defined(OS_ANDROID)
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  is_headless_ = command_line->HasSwitch(mojo::kUseHeadlessConfig);
+  is_headless_ = command_line->HasSwitch(kUseHeadlessConfig);
   if (!is_headless_) {
 #if defined(USE_X11)
-    if (command_line->HasSwitch(mojo::kUseX11TestConfig)) {
+    if (command_line->HasSwitch(kUseX11TestConfig)) {
       XInitThreads();
       ui::test::SetUseOverrideRedirectWindowByDefault(true);
     }
@@ -67,27 +68,27 @@ void ViewManagerApp::Initialize(ApplicationImpl* app) {
 #endif
 
   if (!gpu_state_.get())
-    gpu_state_ = new gles2::GpuState;
+    gpu_state_ = new GpuState;
   connection_manager_.reset(new ConnectionManager(this, surfaces_state_));
 }
 
-bool ViewManagerApp::ConfigureIncomingConnection(
+bool MandolineUIServicesApp::ConfigureIncomingConnection(
     ApplicationConnection* connection) {
-  // ViewManager
+  // MandolineUIServices
   connection->AddService<ViewTreeHostFactory>(this);
   // GPU
   connection->AddService<Gpu>(this);
   return true;
 }
 
-void ViewManagerApp::OnNoMoreRootConnections() {
+void MandolineUIServicesApp::OnNoMoreRootConnections() {
   app_impl_->Quit();
 }
 
-ClientConnection* ViewManagerApp::CreateClientConnectionForEmbedAtView(
+ClientConnection* MandolineUIServicesApp::CreateClientConnectionForEmbedAtView(
     ConnectionManager* connection_manager,
     mojo::InterfaceRequest<mojo::ViewTree> tree_request,
-    mojo::ConnectionSpecificId creator_id,
+    ConnectionSpecificId creator_id,
     mojo::URLRequestPtr request,
     const ViewId& root_id,
     uint32_t policy_bitmask) {
@@ -100,10 +101,10 @@ ClientConnection* ViewManagerApp::CreateClientConnectionForEmbedAtView(
                                      tree_request.Pass(), client.Pass());
 }
 
-ClientConnection* ViewManagerApp::CreateClientConnectionForEmbedAtView(
+ClientConnection* MandolineUIServicesApp::CreateClientConnectionForEmbedAtView(
     ConnectionManager* connection_manager,
     mojo::InterfaceRequest<mojo::ViewTree> tree_request,
-    mojo::ConnectionSpecificId creator_id,
+    ConnectionSpecificId creator_id,
     const ViewId& root_id,
     uint32_t policy_bitmask,
     mojo::ViewTreeClientPtr client) {
@@ -113,19 +114,20 @@ ClientConnection* ViewManagerApp::CreateClientConnectionForEmbedAtView(
                                      tree_request.Pass(), client.Pass());
 }
 
-void ViewManagerApp::Create(ApplicationConnection* connection,
-                            InterfaceRequest<ViewTreeHostFactory> request) {
+void MandolineUIServicesApp::Create(
+    ApplicationConnection* connection,
+    InterfaceRequest<ViewTreeHostFactory> request) {
   factory_bindings_.AddBinding(this, request.Pass());
 }
 
-void ViewManagerApp::Create(mojo::ApplicationConnection* connection,
-                            mojo::InterfaceRequest<Gpu> request) {
+void MandolineUIServicesApp::Create(mojo::ApplicationConnection* connection,
+                                    mojo::InterfaceRequest<Gpu> request) {
   if (!gpu_state_.get())
-    gpu_state_ = new gles2::GpuState;
-  new gles2::GpuImpl(request.Pass(), gpu_state_);
+    gpu_state_ = new GpuState;
+  new GpuImpl(request.Pass(), gpu_state_);
 }
 
-void ViewManagerApp::CreateViewTreeHost(
+void MandolineUIServicesApp::CreateViewTreeHost(
     mojo::InterfaceRequest<mojo::ViewTreeHost> host,
     mojo::ViewTreeHostClientPtr host_client,
     mojo::ViewTreeClientPtr tree_client) {
@@ -143,4 +145,4 @@ void ViewManagerApp::CreateViewTreeHost(
       connection_manager_.get()));
 }
 
-}  // namespace view_manager
+}  // namespace mus