Index: components/mus/connection_manager.h |
diff --git a/components/view_manager/connection_manager.h b/components/mus/connection_manager.h |
similarity index 93% |
rename from components/view_manager/connection_manager.h |
rename to components/mus/connection_manager.h |
index 2b4d6a4608bf612be115f2591cef601b7cdc7a1d..4a248c7c5087d4f37215d1ae3d92d5a8c0abc685 100644 |
--- a/components/view_manager/connection_manager.h |
+++ b/components/mus/connection_manager.h |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_ |
-#define COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_ |
+#ifndef COMPONENTS_MUS_CONNECTION_MANAGER_H_ |
+#define COMPONENTS_MUS_CONNECTION_MANAGER_H_ |
#include <map> |
#include <set> |
@@ -11,14 +11,14 @@ |
#include "base/basictypes.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/timer/timer.h" |
-#include "components/view_manager/focus_controller_delegate.h" |
-#include "components/view_manager/ids.h" |
-#include "components/view_manager/public/interfaces/view_tree.mojom.h" |
-#include "components/view_manager/public/interfaces/view_tree_host.mojom.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/view_manager/view_tree_host_impl.h" |
+#include "components/mus/focus_controller_delegate.h" |
+#include "components/mus/ids.h" |
+#include "components/mus/public/interfaces/view_tree.mojom.h" |
+#include "components/mus/public/interfaces/view_tree_host.mojom.h" |
+#include "components/mus/server_view_delegate.h" |
+#include "components/mus/server_view_observer.h" |
+#include "components/mus/surfaces/surfaces_state.h" |
+#include "components/mus/view_tree_host_impl.h" |
#include "mojo/converters/surfaces/custom_surface_converter.h" |
#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" |
#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" |
@@ -105,8 +105,7 @@ class ConnectionManager : public ServerViewDelegate, |
mojo::ViewTreeClientPtr client); |
// Returns the connection by id. |
- ViewTreeImpl* GetConnection( |
- mojo::ConnectionSpecificId connection_id); |
+ ViewTreeImpl* GetConnection(mojo::ConnectionSpecificId connection_id); |
// Returns the View identified by |id|. |
ServerView* GetView(const ViewId& id); |
@@ -262,4 +261,4 @@ class ConnectionManager : public ServerViewDelegate, |
} // namespace view_manager |
-#endif // COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_ |
+#endif // COMPONENTS_MUS_CONNECTION_MANAGER_H_ |