components/mus/vm/connection_manager.h - Issue 1377493002: mus: move View Manager to components/mus/vm

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/mus/vm/connection_manager.h

Issue 1377493002: mus: move View Manager to components/mus/vm (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

Index: components/mus/vm/connection_manager.h

diff --git a/components/mus/connection_manager.h b/components/mus/vm/connection_manager.h

similarity index 96%

rename from components/mus/connection_manager.h

rename to components/mus/vm/connection_manager.h

index 7a76420c65604a66027b950547b02dc7d6684e89..d810f6252628316fa53d2c01506485a5a7aa0e01 100644

--- a/components/mus/connection_manager.h

+++ b/components/mus/vm/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_MUS_CONNECTION_MANAGER_H_

-#define COMPONENTS_MUS_CONNECTION_MANAGER_H_

+#ifndef COMPONENTS_MUS_VM_CONNECTION_MANAGER_H_

+#define COMPONENTS_MUS_VM_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/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 "components/mus/vm/focus_controller_delegate.h"

+#include "components/mus/vm/ids.h"

+#include "components/mus/vm/server_view_delegate.h"

+#include "components/mus/vm/server_view_observer.h"

+#include "components/mus/vm/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"

@@ -259,4 +259,4 @@ class ConnectionManager : public ServerViewDelegate,

} // namespace mus

-#endif // COMPONENTS_MUS_CONNECTION_MANAGER_H_

+#endif // COMPONENTS_MUS_VM_CONNECTION_MANAGER_H_

« no previous file with comments | « components/mus/vm/client_connection.cc ('k') | components/mus/vm/connection_manager.cc » ('j') | no next file with comments »