Index: components/mus/server_view.cc |
diff --git a/components/view_manager/server_view.cc b/components/mus/server_view.cc |
similarity index 94% |
rename from components/view_manager/server_view.cc |
rename to components/mus/server_view.cc |
index 8c4f69d80713464a82dc1429807cc3f1feab6dcb..42520a34bf91fc4514a8a6f1244cbe8f235125ed 100644 |
--- a/components/view_manager/server_view.cc |
+++ b/components/mus/server_view.cc |
@@ -2,14 +2,14 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "components/view_manager/server_view.h" |
+#include "components/mus/server_view.h" |
#include <inttypes.h> |
#include "base/strings/stringprintf.h" |
-#include "components/view_manager/server_view_delegate.h" |
-#include "components/view_manager/server_view_observer.h" |
-#include "components/view_manager/surfaces/surfaces_state.h" |
+#include "components/mus/server_view_delegate.h" |
+#include "components/mus/server_view_observer.h" |
+#include "components/mus/surfaces/surfaces_state.h" |
#include "mojo/converters/geometry/geometry_type_converters.h" |
#include "mojo/converters/surfaces/surfaces_type_converters.h" |
@@ -256,9 +256,8 @@ void ServerView::SubmitCompositorFrame( |
new cc::SurfaceFactory(delegate_->GetSurfacesState()->manager(), this)); |
} |
if (!surface_id_allocator_) { |
- surface_id_allocator_.reset( |
- new cc::SurfaceIdAllocator( |
- delegate_->GetSurfacesState()->next_id_namespace())); |
+ surface_id_allocator_.reset(new cc::SurfaceIdAllocator( |
+ delegate_->GetSurfacesState()->next_id_namespace())); |
} |
if (surface_id().is_null()) { |
// Create a Surface ID for the first time for this view. |
@@ -276,8 +275,7 @@ void ServerView::SubmitCompositorFrame( |
} |
} |
surface_factory_->SubmitCompositorFrame( |
- surface_id(), |
- delegate_->UpdateViewTreeFromCompositorFrame(frame), |
+ surface_id(), delegate_->UpdateViewTreeFromCompositorFrame(frame), |
base::Bind(&CallCallback, callback)); |
delegate_->GetSurfacesState()->scheduler()->SetNeedsDraw(); |
last_submitted_frame_size_ = frame_size; |
@@ -302,8 +300,7 @@ void ServerView::BuildDebugInfo(const std::string& depth, |
} |
#endif |
-void ServerView::ReturnResources( |
- const cc::ReturnedResourceArray& resources) { |
+void ServerView::ReturnResources(const cc::ReturnedResourceArray& resources) { |
if (!client_) |
return; |
client_->ReturnResources( |