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

Unified Diff: components/mus/ws/client_connection.h

Issue 1406153004: components/mus/public/interfaces View => Window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Yet another rebase Created 5 years, 2 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/ws/access_policy.h ('k') | components/mus/ws/client_connection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/client_connection.h
diff --git a/components/mus/ws/client_connection.h b/components/mus/ws/client_connection.h
index a4550793295fa07a22f2c7d93f5edb0666732d38..3aaf3aa2013383abaf317b71799dc101f8dc26ac 100644
--- a/components/mus/ws/client_connection.h
+++ b/components/mus/ws/client_connection.h
@@ -6,7 +6,7 @@
#define COMPONENTS_MUS_WS_CLIENT_CONNECTION_H_
#include "base/memory/scoped_ptr.h"
-#include "components/mus/public/interfaces/view_tree.mojom.h"
+#include "components/mus/public/interfaces/window_tree.mojom.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
namespace mus {
@@ -19,17 +19,17 @@ class ViewTreeImpl;
class ClientConnection {
public:
ClientConnection(scoped_ptr<ViewTreeImpl> service,
- mojo::ViewTreeClient* client);
+ mojom::WindowTreeClient* client);
virtual ~ClientConnection();
ViewTreeImpl* service() { return service_.get(); }
const ViewTreeImpl* service() const { return service_.get(); }
- mojo::ViewTreeClient* client() { return client_; }
+ mojom::WindowTreeClient* client() { return client_; }
private:
scoped_ptr<ViewTreeImpl> service_;
- mojo::ViewTreeClient* client_;
+ mojom::WindowTreeClient* client_;
DISALLOW_COPY_AND_ASSIGN(ClientConnection);
};
@@ -40,14 +40,14 @@ class DefaultClientConnection : public ClientConnection {
DefaultClientConnection(
scoped_ptr<ViewTreeImpl> service_impl,
ConnectionManager* connection_manager,
- mojo::InterfaceRequest<mojo::ViewTree> service_request,
- mojo::ViewTreeClientPtr client);
+ mojo::InterfaceRequest<mojom::WindowTree> service_request,
+ mojom::WindowTreeClientPtr client);
~DefaultClientConnection() override;
private:
ConnectionManager* connection_manager_;
- mojo::Binding<mojo::ViewTree> binding_;
- mojo::ViewTreeClientPtr client_;
+ mojo::Binding<mojom::WindowTree> binding_;
+ mojom::WindowTreeClientPtr client_;
DISALLOW_COPY_AND_ASSIGN(DefaultClientConnection);
};
« no previous file with comments | « components/mus/ws/access_policy.h ('k') | components/mus/ws/client_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698