Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: components/mus/view_manager_app.cc

Issue 1344573002: Mandoline: Rename components/view_manager to components/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/mus/view_manager_app.h ('k') | components/mus/view_manager_client_apptest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/view_manager_app.cc
diff --git a/components/view_manager/view_manager_app.cc b/components/mus/view_manager_app.cc
similarity index 84%
rename from components/view_manager/view_manager_app.cc
rename to components/mus/view_manager_app.cc
index 922fdacf2178a6a4ec72d7c163cdc10d1eca74e2..f80c7fba8a770006dbcd408ebd58515753b4ffe1 100644
--- a/components/view_manager/view_manager_app.cc
+++ b/components/mus/view_manager_app.cc
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/view_manager/view_manager_app.h"
+#include "components/mus/view_manager_app.h"
#include "base/command_line.h"
#include "base/stl_util.h"
-#include "components/view_manager/client_connection.h"
-#include "components/view_manager/connection_manager.h"
-#include "components/view_manager/gles2/gpu_impl.h"
-#include "components/view_manager/public/cpp/args.h"
-#include "components/view_manager/surfaces/surfaces_scheduler.h"
-#include "components/view_manager/view_tree_host_connection.h"
-#include "components/view_manager/view_tree_host_impl.h"
-#include "components/view_manager/view_tree_impl.h"
+#include "components/mus/client_connection.h"
+#include "components/mus/connection_manager.h"
+#include "components/mus/gles2/gpu_impl.h"
+#include "components/mus/public/cpp/args.h"
+#include "components/mus/surfaces/surfaces_scheduler.h"
+#include "components/mus/view_tree_host_connection.h"
+#include "components/mus/view_tree_host_impl.h"
+#include "components/mus/view_tree_impl.h"
#include "mojo/application/public/cpp/application_connection.h"
#include "mojo/application/public/cpp/application_impl.h"
#include "mojo/application/public/cpp/application_runner.h"
@@ -37,10 +37,7 @@ using mojo::ViewTreeHostFactory;
namespace view_manager {
-ViewManagerApp::ViewManagerApp()
- : app_impl_(nullptr),
- is_headless_(false) {
-}
+ViewManagerApp::ViewManagerApp() : app_impl_(nullptr), is_headless_(false) {}
ViewManagerApp::~ViewManagerApp() {
if (gpu_state_)
@@ -111,8 +108,7 @@ ClientConnection* ViewManagerApp::CreateClientConnectionForEmbedAtView(
scoped_ptr<ViewTreeImpl> service(
new ViewTreeImpl(connection_manager, creator_id, root_id));
return new DefaultClientConnection(service.Pass(), connection_manager,
- tree_request.Pass(),
- client.Pass());
+ tree_request.Pass(), client.Pass());
}
void ViewManagerApp::Create(ApplicationConnection* connection,
@@ -120,9 +116,8 @@ void ViewManagerApp::Create(ApplicationConnection* connection,
factory_bindings_.AddBinding(this, request.Pass());
}
-void ViewManagerApp::Create(
- mojo::ApplicationConnection* connection,
- mojo::InterfaceRequest<Gpu> request) {
+void ViewManagerApp::Create(mojo::ApplicationConnection* connection,
+ mojo::InterfaceRequest<Gpu> request) {
if (!gpu_state_.get())
gpu_state_ = new gles2::GpuState;
new gles2::GpuImpl(request.Pass(), gpu_state_);
« no previous file with comments | « components/mus/view_manager_app.h ('k') | components/mus/view_manager_client_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698