Revert of Mandoline UI Process: Update namespaces and file names

components/mus/view_tree_impl.cc

Index: components/mus/view_tree_impl.cc
diff --git a/components/mus/view_tree_impl.cc b/components/mus/view_tree_impl.cc
index b97583e1fbf1b804651bc5491cd63a145e011539..bcc0364ac199999bcd1753fe2a700cac1d33bfc4 100644
--- a/components/mus/view_tree_impl.cc
+++ b/components/mus/view_tree_impl.cc
@@ -20,6 +20,7 @@
 
 using mojo::Array;
 using mojo::Callback;
+using mojo::Id;
 using mojo::InterfaceRequest;
 using mojo::OrderDirection;
 using mojo::Rect;
@@ -28,10 +29,10 @@
 using mojo::String;
 using mojo::ViewDataPtr;
 
-namespace mus {
+namespace view_manager {
 
 ViewTreeImpl::ViewTreeImpl(ConnectionManager* connection_manager,
-                           ConnectionSpecificId creator_id,
+                           mojo::ConnectionSpecificId creator_id,
                            const ViewId& root_id,
                            uint32_t policy_bitmask)
     : connection_manager_(connection_manager),
@@ -67,7 +68,7 @@
   const ServerView* focused_view = host ? host->GetFocusedView() : nullptr;
   if (focused_view)
     focused_view = access_policy_->GetViewForFocusChange(focused_view);
-  const Id focused_view_transport_id(
+  const mojo::Id focused_view_transport_id(
       ViewIdToTransportId(focused_view ? focused_view->id() : ViewId()));
 
   client->OnEmbed(id_, ViewToViewData(to_send.front()), tree.Pass(),
@@ -155,7 +156,7 @@
 bool ViewTreeImpl::Embed(const ViewId& view_id,
                          mojo::ViewTreeClientPtr client,
                          uint32_t policy_bitmask,
-                         ConnectionSpecificId* connection_id) {
+                         mojo::ConnectionSpecificId* connection_id) {
   *connection_id = kInvalidConnectionId;
   if (!client.get() || !CanEmbed(view_id, policy_bitmask))
     return false;
@@ -605,7 +606,7 @@
   callback.Run(success);
 }
 
-void ViewTreeImpl::RequestSurface(Id view_id,
+void ViewTreeImpl::RequestSurface(mojo::Id view_id,
                                   mojo::InterfaceRequest<mojo::Surface> surface,
                                   mojo::SurfaceClientPtr client) {
   ServerView* view = GetView(ViewIdFromTransportId(view_id));
@@ -638,11 +639,11 @@
   }
 }
 
-void ViewTreeImpl::Embed(Id transport_view_id,
+void ViewTreeImpl::Embed(mojo::Id transport_view_id,
                          mojo::ViewTreeClientPtr client,
                          uint32_t policy_bitmask,
                          const EmbedCallback& callback) {
-  ConnectionSpecificId connection_id = kInvalidConnectionId;
+  mojo::ConnectionSpecificId connection_id = kInvalidConnectionId;
   const bool result = Embed(ViewIdFromTransportId(transport_view_id),
                             client.Pass(), policy_bitmask, &connection_id);
   callback.Run(result, connection_id);
@@ -679,4 +680,4 @@
   return is_embed_root_ && root_ && GetView(*root_)->Contains(view);
 }
 
-}  // namespace mus
+}  // namespace view_manager