diff options
author | fsamuel <fsamuel@chromium.org> | 2015-10-16 16:48:36 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-16 23:50:02 +0000 |
commit | 3c32ae57723269239c36582c2dbd1ee1ac6f36cd (patch) | |
tree | 8e04349154d02ccd234a13701851fc06477057f6 /components/mus/ws/connection_manager.h | |
parent | 6baea1cba0a861e782e7a402ba6f8822708940fb (diff) | |
download | chromium_src-3c32ae57723269239c36582c2dbd1ee1ac6f36cd.zip chromium_src-3c32ae57723269239c36582c2dbd1ee1ac6f36cd.tar.gz chromium_src-3c32ae57723269239c36582c2dbd1ee1ac6f36cd.tar.bz2 |
components/mus/public/interfaces View => Window
This CL updates the namespace of the mojoms to mus.mojom.
BUG=542848
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/1406153004
Cr-Commit-Position: refs/heads/master@{#354643}
Diffstat (limited to 'components/mus/ws/connection_manager.h')
-rw-r--r-- | components/mus/ws/connection_manager.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/components/mus/ws/connection_manager.h b/components/mus/ws/connection_manager.h index 713deaf..da21754 100644 --- a/components/mus/ws/connection_manager.h +++ b/components/mus/ws/connection_manager.h @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/timer/timer.h" -#include "components/mus/public/interfaces/view_tree.mojom.h" -#include "components/mus/public/interfaces/view_tree_host.mojom.h" +#include "components/mus/public/interfaces/window_tree.mojom.h" +#include "components/mus/public/interfaces/window_tree_host.mojom.h" #include "components/mus/surfaces/surfaces_state.h" #include "components/mus/ws/focus_controller_delegate.h" #include "components/mus/ws/ids.h" @@ -101,7 +101,7 @@ class ConnectionManager : public ServerViewDelegate, public ServerViewObserver { ViewTreeImpl* EmbedAtView(ConnectionSpecificId creator_id, const ViewId& view_id, uint32_t policy_bitmask, - mojo::ViewTreeClientPtr client); + mojom::WindowTreeClientPtr client); // Returns the connection by id. ViewTreeImpl* GetConnection(ConnectionSpecificId connection_id); @@ -133,7 +133,7 @@ class ConnectionManager : public ServerViewDelegate, public ServerViewObserver { bool DidConnectionMessageClient(ConnectionSpecificId id) const; // Returns the metrics of the viewport where the provided |view| is displayed. - mojo::ViewportMetricsPtr GetViewportMetricsForView(const ServerView* view); + mojom::ViewportMetricsPtr GetViewportMetricsForView(const ServerView* view); // Returns the ViewTreeImpl that has |id| as a root. ViewTreeImpl* GetConnectionWithRoot(const ViewId& id) { @@ -142,8 +142,8 @@ class ConnectionManager : public ServerViewDelegate, public ServerViewObserver { } const ViewTreeImpl* GetConnectionWithRoot(const ViewId& id) const; - ViewTreeHostImpl* GetViewTreeHostByView(const ServerView* view); - const ViewTreeHostImpl* GetViewTreeHostByView(const ServerView* view) const; + ViewTreeHostImpl* GetWindowTreeHostByView(const ServerView* view); + const ViewTreeHostImpl* GetWindowTreeHostByView(const ServerView* view) const; // Returns the first ancestor of |service| that is marked as an embed root. ViewTreeImpl* GetEmbedRoot(ViewTreeImpl* service); @@ -160,8 +160,8 @@ class ConnectionManager : public ServerViewDelegate, public ServerViewObserver { void ProcessClientAreaChanged(const ServerView* window, const gfx::Rect& old_client_area, const gfx::Rect& new_client_area); - void ProcessViewportMetricsChanged(const mojo::ViewportMetrics& old_metrics, - const mojo::ViewportMetrics& new_metrics); + void ProcessViewportMetricsChanged(const mojom::ViewportMetrics& old_metrics, + const mojom::ViewportMetrics& new_metrics); void ProcessWillChangeViewHierarchy(const ServerView* view, const ServerView* new_parent, const ServerView* old_parent); @@ -170,7 +170,7 @@ class ConnectionManager : public ServerViewDelegate, public ServerViewObserver { const ServerView* old_parent); void ProcessViewReorder(const ServerView* view, const ServerView* relative_view, - const mojo::OrderDirection direction); + const mojom::OrderDirection direction); void ProcessViewDeleted(const ViewId& view); private: @@ -218,7 +218,7 @@ class ConnectionManager : public ServerViewDelegate, public ServerViewObserver { const gfx::Rect& new_client_area) override; void OnViewReordered(ServerView* view, ServerView* relative, - mojo::OrderDirection direction) override; + mojom::OrderDirection direction) override; void OnWillChangeViewVisibility(ServerView* view) override; void OnViewSharedPropertyChanged( ServerView* view, |