diff options
author | thakis <thakis@chromium.org> | 2015-09-16 19:48:48 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-17 02:49:24 +0000 |
commit | 35b19f7d5d7b7b68878d6c766e93e148f8b06998 (patch) | |
tree | 546289030a5e80740af920e59ce31827d907bd2a /components/mus/server_view_delegate.h | |
parent | eef6f20ef572c4c128612384a63384aaa7d23fe7 (diff) | |
download | chromium_src-35b19f7d5d7b7b68878d6c766e93e148f8b06998.zip chromium_src-35b19f7d5d7b7b68878d6c766e93e148f8b06998.tar.gz chromium_src-35b19f7d5d7b7b68878d6c766e93e148f8b06998.tar.bz2 |
Revert of Mandoline UI Process: Update namespaces and file names (patchset #9 id:150001 of https://codereview.chromium.org/1340983002/ )
Reason for revert:
Speculative, might've broken mojo_apptests on http://build.chromium.org/p/chromium.linux/builders/Linux%20GN/builds/32066
Original issue's description:
> Mandoline UI Process: Update namespaces and file names
>
> This CL updates namespaces in components/mus to mus from mojo, surfaces, gles2, and view_manager.
>
> BUG=531533
> TBR=jam@chromium.org for trivial pdf_viewer change.
>
> Committed: https://crrev.com/49b0d73f3ebb4801fc518751145504af3a2f70ed
> Cr-Commit-Position: refs/heads/master@{#349229}
TBR=sky@chromium.org,fsamuel@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=531533
Review URL: https://codereview.chromium.org/1351013002
Cr-Commit-Position: refs/heads/master@{#349332}
Diffstat (limited to 'components/mus/server_view_delegate.h')
-rw-r--r-- | components/mus/server_view_delegate.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/components/mus/server_view_delegate.h b/components/mus/server_view_delegate.h index abe0aaa..8f846a8 100644 --- a/components/mus/server_view_delegate.h +++ b/components/mus/server_view_delegate.h @@ -7,23 +7,26 @@ #include "base/memory/scoped_ptr.h" #include "components/mus/public/interfaces/compositor_frame.mojom.h" -#include "components/mus/public/interfaces/mus_constants.mojom.h" +#include "components/mus/public/interfaces/view_manager_constants.mojom.h" namespace cc { class CompositorFrame; } -namespace mus { +namespace surfaces { +class SurfacesState; +} + +namespace view_manager { class ServerView; -class SurfacesState; class ServerViewDelegate { public: virtual scoped_ptr<cc::CompositorFrame> UpdateViewTreeFromCompositorFrame( const mojo::CompositorFramePtr& input) = 0; - virtual SurfacesState* GetSurfacesState() = 0; + virtual surfaces::SurfacesState* GetSurfacesState() = 0; virtual void OnScheduleViewPaint(const ServerView* view) = 0; @@ -35,6 +38,6 @@ class ServerViewDelegate { virtual ~ServerViewDelegate() {} }; -} // namespace mus +} // namespace view_manager #endif // COMPONENTS_MUS_SERVER_VIEW_DELEGATE_H_ |