diff options
Diffstat (limited to 'mojo/services/view_manager')
-rw-r--r-- | mojo/services/view_manager/connection_manager.h | 32 | ||||
-rw-r--r-- | mojo/services/view_manager/default_access_policy.h | 31 | ||||
-rw-r--r-- | mojo/services/view_manager/display_manager.h | 11 | ||||
-rw-r--r-- | mojo/services/view_manager/main.cc | 10 | ||||
-rw-r--r-- | mojo/services/view_manager/view_manager_init_service_impl.h | 8 | ||||
-rw-r--r-- | mojo/services/view_manager/view_manager_service_impl.h | 69 | ||||
-rw-r--r-- | mojo/services/view_manager/view_manager_unittest.cc | 82 | ||||
-rw-r--r-- | mojo/services/view_manager/window_manager_access_policy.h | 31 | ||||
-rw-r--r-- | mojo/services/view_manager/window_manager_client_impl.h | 7 |
9 files changed, 134 insertions, 147 deletions
diff --git a/mojo/services/view_manager/connection_manager.h b/mojo/services/view_manager/connection_manager.h index 1917439..618460f 100644 --- a/mojo/services/view_manager/connection_manager.h +++ b/mojo/services/view_manager/connection_manager.h @@ -68,7 +68,7 @@ class MOJO_VIEW_MANAGER_EXPORT ConnectionManager : public ServerViewDelegate { ConnectionManager(ApplicationConnection* app_connection, const Callback<void()>& native_viewport_closed_callback); - virtual ~ConnectionManager(); + ~ConnectionManager() override; // Returns the id for the next ViewManagerServiceImpl. ConnectionSpecificId GetAndAdvanceNextConnectionId(); @@ -164,21 +164,21 @@ class MOJO_VIEW_MANAGER_EXPORT ConnectionManager : public ServerViewDelegate { InterfaceRequest<ServiceProvider> service_provider); // Overridden from ServerViewDelegate: - virtual void OnViewDestroyed(const ServerView* view) override; - virtual void OnWillChangeViewHierarchy(const ServerView* view, - const ServerView* new_parent, - const ServerView* old_parent) override; - virtual void OnViewHierarchyChanged(const ServerView* view, - const ServerView* new_parent, - const ServerView* old_parent) override; - virtual void OnViewBoundsChanged(const ServerView* view, - const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) override; - virtual void OnViewSurfaceIdChanged(const ServerView* view) override; - virtual void OnViewReordered(const ServerView* view, - const ServerView* relative, - OrderDirection direction) override; - virtual void OnWillChangeViewVisibility(const ServerView* view) override; + void OnViewDestroyed(const ServerView* view) override; + void OnWillChangeViewHierarchy(const ServerView* view, + const ServerView* new_parent, + const ServerView* old_parent) override; + void OnViewHierarchyChanged(const ServerView* view, + const ServerView* new_parent, + const ServerView* old_parent) override; + void OnViewBoundsChanged(const ServerView* view, + const gfx::Rect& old_bounds, + const gfx::Rect& new_bounds) override; + void OnViewSurfaceIdChanged(const ServerView* view) override; + void OnViewReordered(const ServerView* view, + const ServerView* relative, + OrderDirection direction) override; + void OnWillChangeViewVisibility(const ServerView* view) override; ApplicationConnection* app_connection_; diff --git a/mojo/services/view_manager/default_access_policy.h b/mojo/services/view_manager/default_access_policy.h index d8c0194..a57ecc2 100644 --- a/mojo/services/view_manager/default_access_policy.h +++ b/mojo/services/view_manager/default_access_policy.h @@ -18,24 +18,23 @@ class DefaultAccessPolicy : public AccessPolicy { public: DefaultAccessPolicy(ConnectionSpecificId connection_id, AccessPolicyDelegate* delegate); - virtual ~DefaultAccessPolicy(); + ~DefaultAccessPolicy() override; // AccessPolicy: - virtual bool CanRemoveViewFromParent(const ServerView* view) const override; - virtual bool CanAddView(const ServerView* parent, - const ServerView* child) const override; - virtual bool CanReorderView(const ServerView* view, - const ServerView* relative_view, - OrderDirection direction) const override; - virtual bool CanDeleteView(const ServerView* view) const override; - virtual bool CanGetViewTree(const ServerView* view) const override; - virtual bool CanDescendIntoViewForViewTree( - const ServerView* view) const override; - virtual bool CanEmbed(const ServerView* view) const override; - virtual bool CanChangeViewVisibility(const ServerView* view) const override; - virtual bool CanSetViewSurfaceId(const ServerView* view) const override; - virtual bool CanSetViewBounds(const ServerView* view) const override; - virtual bool ShouldNotifyOnHierarchyChange( + bool CanRemoveViewFromParent(const ServerView* view) const override; + bool CanAddView(const ServerView* parent, + const ServerView* child) const override; + bool CanReorderView(const ServerView* view, + const ServerView* relative_view, + OrderDirection direction) const override; + bool CanDeleteView(const ServerView* view) const override; + bool CanGetViewTree(const ServerView* view) const override; + bool CanDescendIntoViewForViewTree(const ServerView* view) const override; + bool CanEmbed(const ServerView* view) const override; + bool CanChangeViewVisibility(const ServerView* view) const override; + bool CanSetViewSurfaceId(const ServerView* view) const override; + bool CanSetViewBounds(const ServerView* view) const override; + bool ShouldNotifyOnHierarchyChange( const ServerView* view, const ServerView** new_parent, const ServerView** old_parent) const override; diff --git a/mojo/services/view_manager/display_manager.h b/mojo/services/view_manager/display_manager.h index 8b95a57..1f5f930 100644 --- a/mojo/services/view_manager/display_manager.h +++ b/mojo/services/view_manager/display_manager.h @@ -40,7 +40,7 @@ class MOJO_VIEW_MANAGER_EXPORT DisplayManager DisplayManager(ApplicationConnection* app_connection, ConnectionManager* connection_manager, const Callback<void()>& native_viewport_closed_callback); - virtual ~DisplayManager(); + ~DisplayManager() override; // Schedules a paint for the specified region of the specified view. void SchedulePaint(const ServerView* view, const gfx::Rect& bounds); @@ -54,13 +54,12 @@ class MOJO_VIEW_MANAGER_EXPORT DisplayManager void Draw(); // NativeViewportClient implementation. - virtual void OnDestroyed() override; - virtual void OnSizeChanged(SizePtr size) override; - virtual void OnEvent(EventPtr event, - const mojo::Callback<void()>& callback) override; + void OnDestroyed() override; + void OnSizeChanged(SizePtr size) override; + void OnEvent(EventPtr event, const mojo::Callback<void()>& callback) override; // SurfaceClient implementation. - virtual void ReturnResources(Array<ReturnedResourcePtr> resources) override; + void ReturnResources(Array<ReturnedResourcePtr> resources) override; ConnectionManager* connection_manager_; diff --git a/mojo/services/view_manager/main.cc b/mojo/services/view_manager/main.cc index cd14dc0..39c48d6b 100644 --- a/mojo/services/view_manager/main.cc +++ b/mojo/services/view_manager/main.cc @@ -16,10 +16,9 @@ class ViewManagerApp : public ApplicationDelegate, public InterfaceFactory<ViewManagerInitService> { public: ViewManagerApp() {} - virtual ~ViewManagerApp() {} + ~ViewManagerApp() override {} - virtual bool ConfigureIncomingConnection( - ApplicationConnection* connection) override { + bool ConfigureIncomingConnection(ApplicationConnection* connection) override { context_.ConfigureIncomingConnection(connection); // TODO(sky): this needs some sort of authentication as well as making sure // we only ever have one active at a time. @@ -27,9 +26,8 @@ class ViewManagerApp : public ApplicationDelegate, return true; } - virtual void Create( - ApplicationConnection* connection, - InterfaceRequest<ViewManagerInitService> request) override { + void Create(ApplicationConnection* connection, + InterfaceRequest<ViewManagerInitService> request) override { BindToRequest(new ViewManagerInitServiceImpl(connection, &context_), &request); } diff --git a/mojo/services/view_manager/view_manager_init_service_impl.h b/mojo/services/view_manager/view_manager_init_service_impl.h index 63fbc38..b36efbe 100644 --- a/mojo/services/view_manager/view_manager_init_service_impl.h +++ b/mojo/services/view_manager/view_manager_init_service_impl.h @@ -34,13 +34,13 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerInitServiceImpl public: ViewManagerInitServiceImpl(ApplicationConnection* connection, ViewManagerInitServiceContext* context); - virtual ~ViewManagerInitServiceImpl(); + ~ViewManagerInitServiceImpl() override; private: // ViewManagerInitService overrides: - virtual void Embed(const String& url, - ServiceProviderPtr service_provider, - const Callback<void(bool)>& callback) override; + void Embed(const String& url, + ServiceProviderPtr service_provider, + const Callback<void(bool)>& callback) override; ViewManagerInitServiceContext* context_; diff --git a/mojo/services/view_manager/view_manager_service_impl.h b/mojo/services/view_manager/view_manager_service_impl.h index c77f285..bb15fcd 100644 --- a/mojo/services/view_manager/view_manager_service_impl.h +++ b/mojo/services/view_manager/view_manager_service_impl.h @@ -47,7 +47,7 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerServiceImpl const std::string& url, const ViewId& root_id, InterfaceRequest<ServiceProvider> service_provider); - virtual ~ViewManagerServiceImpl(); + ~ViewManagerServiceImpl() override; // Used to mark this connection as originating from a call to // ViewManagerService::Connect(). When set OnConnectionError() deletes |this|. @@ -96,7 +96,7 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerServiceImpl // TODO(sky): move this to private section (currently can't because of // bindings). // InterfaceImp overrides: - virtual void OnConnectionError() override; + void OnConnectionError() override; private: typedef std::map<ConnectionSpecificId, ServerView*> ViewMap; @@ -147,45 +147,42 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerServiceImpl void NotifyDrawnStateChanged(const ServerView* view, bool new_drawn_value); // ViewManagerService: - virtual void CreateView(Id transport_view_id, - const Callback<void(ErrorCode)>& callback) override; - virtual void DeleteView(Id transport_view_id, - const Callback<void(bool)>& callback) override; - virtual void AddView(Id parent_id, - Id child_id, - const Callback<void(bool)>& callback) override; - virtual void RemoveViewFromParent( - Id view_id, - const Callback<void(bool)>& callback) override; - virtual void ReorderView(Id view_id, - Id relative_view_id, - OrderDirection direction, - const Callback<void(bool)>& callback) override; - virtual void GetViewTree( - Id view_id, - const Callback<void(Array<ViewDataPtr>)>& callback) override; - virtual void SetViewSurfaceId(Id view_id, - SurfaceIdPtr surface_id, - const Callback<void(bool)>& callback) override; - virtual void SetViewBounds(Id view_id, - RectPtr bounds, - const Callback<void(bool)>& callback) override; - virtual void SetViewVisibility(Id view_id, - bool visible, - const Callback<void(bool)>& callback) override; - virtual void Embed(const String& url, - Id view_id, - ServiceProviderPtr service_provider, + void CreateView(Id transport_view_id, + const Callback<void(ErrorCode)>& callback) override; + void DeleteView(Id transport_view_id, + const Callback<void(bool)>& callback) override; + void AddView(Id parent_id, + Id child_id, + const Callback<void(bool)>& callback) override; + void RemoveViewFromParent(Id view_id, + const Callback<void(bool)>& callback) override; + void ReorderView(Id view_id, + Id relative_view_id, + OrderDirection direction, + const Callback<void(bool)>& callback) override; + void GetViewTree(Id view_id, + const Callback<void(Array<ViewDataPtr>)>& callback) override; + void SetViewSurfaceId(Id view_id, + SurfaceIdPtr surface_id, + const Callback<void(bool)>& callback) override; + void SetViewBounds(Id view_id, + RectPtr bounds, const Callback<void(bool)>& callback) override; + void SetViewVisibility(Id view_id, + bool visible, + const Callback<void(bool)>& callback) override; + void Embed(const String& url, + Id view_id, + ServiceProviderPtr service_provider, + const Callback<void(bool)>& callback) override; // InterfaceImpl: - virtual void OnConnectionEstablished() override; + void OnConnectionEstablished() override; // AccessPolicyDelegate: - virtual const base::hash_set<Id>& GetRootsForAccessPolicy() const override; - virtual bool IsViewKnownForAccessPolicy( - const ServerView* view) const override; - virtual bool IsViewRootOfAnotherConnectionForAccessPolicy( + const base::hash_set<Id>& GetRootsForAccessPolicy() const override; + bool IsViewKnownForAccessPolicy(const ServerView* view) const override; + bool IsViewRootOfAnotherConnectionForAccessPolicy( const ServerView* view) const override; ConnectionManager* connection_manager_; diff --git a/mojo/services/view_manager/view_manager_unittest.cc b/mojo/services/view_manager/view_manager_unittest.cc index abf874e..073ad4c 100644 --- a/mojo/services/view_manager/view_manager_unittest.cc +++ b/mojo/services/view_manager/view_manager_unittest.cc @@ -65,8 +65,7 @@ class ViewManagerProxy : public TestChangeTracker::Delegate { SetInstance(this); } - virtual ~ViewManagerProxy() { - } + ~ViewManagerProxy() override {} // Returns true if in an initial state. If this returns false it means the // last test didn't clean up properly, or most likely didn't invoke @@ -288,7 +287,7 @@ class ViewManagerProxy : public TestChangeTracker::Delegate { } // TestChangeTracker::Delegate: - virtual void OnChangeAdded() override { + void OnChangeAdded() override { if (quit_count_ > 0 && --quit_count_ == 0) QuitCountReached(); } @@ -336,45 +335,44 @@ class TestViewManagerClientConnection ViewManagerProxy* proxy() { return &proxy_; } // InterfaceImpl: - virtual void OnConnectionEstablished() override { + void OnConnectionEstablished() override { proxy_.set_router(internal_state()->router()); proxy_.set_view_manager(client()); } // ViewManagerClient: - virtual void OnEmbed( - ConnectionSpecificId connection_id, - const String& creator_url, - ViewDataPtr root, - InterfaceRequest<ServiceProvider> services) override { + void OnEmbed(ConnectionSpecificId connection_id, + const String& creator_url, + ViewDataPtr root, + InterfaceRequest<ServiceProvider> services) override { tracker_.OnEmbed(connection_id, creator_url, root.Pass()); } - virtual void OnViewBoundsChanged(Id view_id, - RectPtr old_bounds, - RectPtr new_bounds) override { + void OnViewBoundsChanged(Id view_id, + RectPtr old_bounds, + RectPtr new_bounds) override { tracker_.OnViewBoundsChanged(view_id, old_bounds.Pass(), new_bounds.Pass()); } - virtual void OnViewHierarchyChanged(Id view, - Id new_parent, - Id old_parent, - Array<ViewDataPtr> views) override { + void OnViewHierarchyChanged(Id view, + Id new_parent, + Id old_parent, + Array<ViewDataPtr> views) override { tracker_.OnViewHierarchyChanged(view, new_parent, old_parent, views.Pass()); } - virtual void OnViewReordered(Id view_id, - Id relative_view_id, - OrderDirection direction) override { + void OnViewReordered(Id view_id, + Id relative_view_id, + OrderDirection direction) override { tracker_.OnViewReordered(view_id, relative_view_id, direction); } - virtual void OnViewDeleted(Id view) override { tracker_.OnViewDeleted(view); } - virtual void OnViewVisibilityChanged(uint32_t view, bool visible) override { + void OnViewDeleted(Id view) override { tracker_.OnViewDeleted(view); } + void OnViewVisibilityChanged(uint32_t view, bool visible) override { tracker_.OnViewVisibilityChanged(view, visible); } - virtual void OnViewDrawnStateChanged(uint32_t view, bool drawn) override { + void OnViewDrawnStateChanged(uint32_t view, bool drawn) override { tracker_.OnViewDrawnStateChanged(view, drawn); } - virtual void OnViewInputEvent(Id view_id, - EventPtr event, - const Callback<void()>& callback) override { + void OnViewInputEvent(Id view_id, + EventPtr event, + const Callback<void()>& callback) override { tracker_.OnViewInputEvent(view_id, event.Pass()); } @@ -389,20 +387,19 @@ class WindowManagerServiceImpl : public InterfaceImpl<WindowManagerService> { public: explicit WindowManagerServiceImpl(TestViewManagerClientConnection* connection) : connection_(connection) {} - virtual ~WindowManagerServiceImpl() {} + ~WindowManagerServiceImpl() override {} // InterfaceImpl: - virtual void OnConnectionEstablished() override { + void OnConnectionEstablished() override { connection_->proxy()->set_window_manager_client(client()); } // WindowManagerService: - virtual void Embed( - const String& url, - InterfaceRequest<ServiceProvider> service_provider) override { + void Embed(const String& url, + InterfaceRequest<ServiceProvider> service_provider) override { connection_->tracker()->DelegateEmbed(url); } - virtual void OnViewInputEvent(mojo::EventPtr event) override {} + void OnViewInputEvent(mojo::EventPtr event) override {} private: TestViewManagerClientConnection* connection_; @@ -418,12 +415,12 @@ class EmbedApplicationLoader : public ApplicationLoader, public InterfaceFactory<WindowManagerService> { public: EmbedApplicationLoader() : last_view_manager_client_(nullptr) {} - virtual ~EmbedApplicationLoader() {} + ~EmbedApplicationLoader() override {} // ApplicationLoader implementation: - virtual void Load(ApplicationManager* manager, - const GURL& url, - scoped_refptr<LoadCallbacks> callbacks) override { + void Load(ApplicationManager* manager, + const GURL& url, + scoped_refptr<LoadCallbacks> callbacks) override { ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication(); if (!shell_handle.is_valid()) return; @@ -431,25 +428,24 @@ class EmbedApplicationLoader : public ApplicationLoader, shell_handle.Pass())); apps_.push_back(app.release()); } - virtual void OnApplicationError(ApplicationManager* manager, - const GURL& url) override {} + void OnApplicationError(ApplicationManager* manager, + const GURL& url) override {} // ApplicationDelegate implementation: - virtual bool ConfigureIncomingConnection(ApplicationConnection* connection) - override { + bool ConfigureIncomingConnection(ApplicationConnection* connection) override { connection->AddService<ViewManagerClient>(this); connection->AddService<WindowManagerService>(this); return true; } // InterfaceFactory<ViewManagerClient> implementation: - virtual void Create(ApplicationConnection* connection, - InterfaceRequest<ViewManagerClient> request) override { + void Create(ApplicationConnection* connection, + InterfaceRequest<ViewManagerClient> request) override { last_view_manager_client_ = new TestViewManagerClientConnection; BindToRequest(last_view_manager_client_, &request); } - virtual void Create(ApplicationConnection* connection, - InterfaceRequest<WindowManagerService> request) override { + void Create(ApplicationConnection* connection, + InterfaceRequest<WindowManagerService> request) override { BindToRequest(new WindowManagerServiceImpl(last_view_manager_client_), &request); } diff --git a/mojo/services/view_manager/window_manager_access_policy.h b/mojo/services/view_manager/window_manager_access_policy.h index aa44fd6..7b8e7a9 100644 --- a/mojo/services/view_manager/window_manager_access_policy.h +++ b/mojo/services/view_manager/window_manager_access_policy.h @@ -17,24 +17,23 @@ class WindowManagerAccessPolicy : public AccessPolicy { public: WindowManagerAccessPolicy(ConnectionSpecificId connection_id, AccessPolicyDelegate* delegate); - virtual ~WindowManagerAccessPolicy(); + ~WindowManagerAccessPolicy() override; // AccessPolicy: - virtual bool CanRemoveViewFromParent(const ServerView* view) const override; - virtual bool CanAddView(const ServerView* parent, - const ServerView* child) const override; - virtual bool CanReorderView(const ServerView* view, - const ServerView* relative_view, - OrderDirection direction) const override; - virtual bool CanDeleteView(const ServerView* view) const override; - virtual bool CanGetViewTree(const ServerView* view) const override; - virtual bool CanDescendIntoViewForViewTree( - const ServerView* view) const override; - virtual bool CanEmbed(const ServerView* view) const override; - virtual bool CanChangeViewVisibility(const ServerView* view) const override; - virtual bool CanSetViewSurfaceId(const ServerView* view) const override; - virtual bool CanSetViewBounds(const ServerView* view) const override; - virtual bool ShouldNotifyOnHierarchyChange( + bool CanRemoveViewFromParent(const ServerView* view) const override; + bool CanAddView(const ServerView* parent, + const ServerView* child) const override; + bool CanReorderView(const ServerView* view, + const ServerView* relative_view, + OrderDirection direction) const override; + bool CanDeleteView(const ServerView* view) const override; + bool CanGetViewTree(const ServerView* view) const override; + bool CanDescendIntoViewForViewTree(const ServerView* view) const override; + bool CanEmbed(const ServerView* view) const override; + bool CanChangeViewVisibility(const ServerView* view) const override; + bool CanSetViewSurfaceId(const ServerView* view) const override; + bool CanSetViewBounds(const ServerView* view) const override; + bool ShouldNotifyOnHierarchyChange( const ServerView* view, const ServerView** new_parent, const ServerView** old_parent) const override; diff --git a/mojo/services/view_manager/window_manager_client_impl.h b/mojo/services/view_manager/window_manager_client_impl.h index b25aafe..704489d 100644 --- a/mojo/services/view_manager/window_manager_client_impl.h +++ b/mojo/services/view_manager/window_manager_client_impl.h @@ -30,14 +30,13 @@ class MOJO_VIEW_MANAGER_EXPORT WindowManagerClientImpl : public InterfaceImpl<WindowManagerClient> { public: explicit WindowManagerClientImpl(ConnectionManager* connection_manager); - virtual ~WindowManagerClientImpl(); + ~WindowManagerClientImpl() override; // WindowManagerClient: - virtual void DispatchInputEventToView(Id transport_view_id, - EventPtr event) override; + void DispatchInputEventToView(Id transport_view_id, EventPtr event) override; // InterfaceImp overrides: - virtual void OnConnectionError() override; + void OnConnectionError() override; private: ConnectionManager* connection_manager_; |