Index: components/mus/server_view_delegate.h |
diff --git a/components/mus/server_view_delegate.h b/components/mus/server_view_delegate.h |
index 8f846a84bc9e8122944dbd2278c621aaf754a3a4..abe0aaa5b4aa28d20065af01504354ce84a23610 100644 |
--- a/components/mus/server_view_delegate.h |
+++ b/components/mus/server_view_delegate.h |
@@ -7,26 +7,23 @@ |
#include "base/memory/scoped_ptr.h" |
#include "components/mus/public/interfaces/compositor_frame.mojom.h" |
-#include "components/mus/public/interfaces/view_manager_constants.mojom.h" |
+#include "components/mus/public/interfaces/mus_constants.mojom.h" |
namespace cc { |
class CompositorFrame; |
} |
-namespace surfaces { |
-class SurfacesState; |
-} |
- |
-namespace view_manager { |
+namespace mus { |
class ServerView; |
+class SurfacesState; |
class ServerViewDelegate { |
public: |
virtual scoped_ptr<cc::CompositorFrame> UpdateViewTreeFromCompositorFrame( |
const mojo::CompositorFramePtr& input) = 0; |
- virtual surfaces::SurfacesState* GetSurfacesState() = 0; |
+ virtual SurfacesState* GetSurfacesState() = 0; |
virtual void OnScheduleViewPaint(const ServerView* view) = 0; |
@@ -38,6 +35,6 @@ class ServerViewDelegate { |
virtual ~ServerViewDelegate() {} |
}; |
-} // namespace view_manager |
+} // namespace mus |
#endif // COMPONENTS_MUS_SERVER_VIEW_DELEGATE_H_ |