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

Unified Diff: components/mus/connection_manager.h

Issue 1344573002: Mandoline: Rename components/view_manager to components/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: components/mus/connection_manager.h
diff --git a/components/view_manager/connection_manager.h b/components/mus/connection_manager.h
similarity index 94%
rename from components/view_manager/connection_manager.h
rename to components/mus/connection_manager.h
index 2b4d6a4608bf612be115f2591cef601b7cdc7a1d..8719f6205f7c208d8c96082b0578c115319781dd 100644
--- a/components/view_manager/connection_manager.h
+++ b/components/mus/connection_manager.h
@@ -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);

Powered by Google App Engine
This is Rietveld 408576698