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

Unified Diff: components/mus/view_tree_host_connection.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/view_tree_host_connection.h
diff --git a/components/view_manager/view_tree_host_connection.h b/components/mus/view_tree_host_connection.h
similarity index 74%
rename from components/view_manager/view_tree_host_connection.h
rename to components/mus/view_tree_host_connection.h
index 0ff96febef95d121c21f8887a6f7ebaa5761163b..71726a3a82e22244444d7af60c53f8c68783a22e 100644
--- a/components/view_manager/view_tree_host_connection.h
+++ b/components/mus/view_tree_host_connection.h
@@ -6,9 +6,9 @@
#define COMPONENTS_VIEW_MANAGER_VIEW_TREE_HOST_CONNECTION_H_
#include "base/memory/scoped_ptr.h"
-#include "components/view_manager/public/interfaces/view_tree_host.mojom.h"
-#include "components/view_manager/view_tree_host_delegate.h"
-#include "components/view_manager/view_tree_host_impl.h"
+#include "components/mus/public/interfaces/view_tree_host.mojom.h"
+#include "components/mus/view_tree_host_delegate.h"
+#include "components/mus/view_tree_host_impl.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
namespace view_manager {
@@ -25,15 +25,12 @@ class ViewTreeImpl;
// ConnectionManager to destroy the root and its associated view tree.
class ViewTreeHostConnection : public ViewTreeHostDelegate {
public:
- ViewTreeHostConnection(
- scoped_ptr<ViewTreeHostImpl> host_impl,
- ConnectionManager* connection_manager);
+ ViewTreeHostConnection(scoped_ptr<ViewTreeHostImpl> host_impl,
+ ConnectionManager* connection_manager);
- void set_view_tree(ViewTreeImpl* tree) {
- tree_ = tree;
- }
+ void set_view_tree(ViewTreeImpl* tree) { tree_ = tree; }
- ViewTreeHostImpl* view_tree_host() { return host_.get();}
+ ViewTreeHostImpl* view_tree_host() { return host_.get(); }
const ViewTreeHostImpl* view_tree_host() const { return host_.get(); }
ConnectionManager* connection_manager() { return connection_manager_; }
@@ -63,14 +60,13 @@ class ViewTreeHostConnection : public ViewTreeHostDelegate {
// Live implementation of ViewTreeHostConnection.
class ViewTreeHostConnectionImpl : public ViewTreeHostConnection {
public:
- ViewTreeHostConnectionImpl(
- mojo::InterfaceRequest<mojo::ViewTreeHost> request,
- scoped_ptr<ViewTreeHostImpl> host_impl,
- mojo::ViewTreeClientPtr client,
- ConnectionManager* connection_manager);
+ ViewTreeHostConnectionImpl(mojo::InterfaceRequest<mojo::ViewTreeHost> request,
+ scoped_ptr<ViewTreeHostImpl> host_impl,
+ mojo::ViewTreeClientPtr client,
+ ConnectionManager* connection_manager);
private:
- ~ViewTreeHostConnectionImpl() override;
+ ~ViewTreeHostConnectionImpl() override;
// ViewTreeHostDelegate:
void OnDisplayInitialized() override;

Powered by Google App Engine
This is Rietveld 408576698