| Index: mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h
|
| diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h
|
| index bd09a58b77f789eddb5ac02857768cfdd9bff093..3a116f81d1b3f754529d2ac3f9a0c7db431def4b 100644
|
| --- a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h
|
| +++ b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h
|
| @@ -82,49 +82,49 @@ class ViewManagerClientImpl : public ViewManager,
|
|
|
| // Overridden from ViewManager:
|
| virtual void SetWindowManagerDelegate(
|
| - WindowManagerDelegate* delegate) OVERRIDE;
|
| - virtual void DispatchEvent(View* target, EventPtr event) OVERRIDE;
|
| - virtual const std::string& GetEmbedderURL() const OVERRIDE;
|
| - virtual const std::vector<View*>& GetRoots() const OVERRIDE;
|
| - virtual View* GetViewById(Id id) OVERRIDE;
|
| + WindowManagerDelegate* delegate) override;
|
| + virtual void DispatchEvent(View* target, EventPtr event) override;
|
| + virtual const std::string& GetEmbedderURL() const override;
|
| + virtual const std::vector<View*>& GetRoots() const override;
|
| + virtual View* GetViewById(Id id) override;
|
|
|
| // Overridden from InterfaceImpl:
|
| - virtual void OnConnectionEstablished() OVERRIDE;
|
| + virtual void OnConnectionEstablished() override;
|
|
|
| // Overridden from ViewManagerClient:
|
| virtual void OnEmbed(ConnectionSpecificId connection_id,
|
| const String& creator_url,
|
| ViewDataPtr root,
|
| - InterfaceRequest<ServiceProvider> services) OVERRIDE;
|
| + InterfaceRequest<ServiceProvider> services) override;
|
| virtual void OnViewBoundsChanged(Id view_id,
|
| RectPtr old_bounds,
|
| - RectPtr new_bounds) OVERRIDE;
|
| + RectPtr new_bounds) override;
|
| virtual void OnViewHierarchyChanged(Id view_id,
|
| Id new_parent_id,
|
| Id old_parent_id,
|
| - Array<ViewDataPtr> views) OVERRIDE;
|
| + Array<ViewDataPtr> views) override;
|
| virtual void OnViewReordered(Id view_id,
|
| Id relative_view_id,
|
| - OrderDirection direction) OVERRIDE;
|
| - virtual void OnViewDeleted(Id view_id) OVERRIDE;
|
| - virtual void OnViewVisibilityChanged(Id view_id, bool visible) OVERRIDE;
|
| - virtual void OnViewDrawnStateChanged(Id view_id, bool drawn) OVERRIDE;
|
| + OrderDirection direction) override;
|
| + virtual void OnViewDeleted(Id view_id) override;
|
| + virtual void OnViewVisibilityChanged(Id view_id, bool visible) override;
|
| + virtual void OnViewDrawnStateChanged(Id view_id, bool drawn) override;
|
| virtual void OnViewInputEvent(Id view_id,
|
| EventPtr event,
|
| - const Callback<void()>& callback) OVERRIDE;
|
| + const Callback<void()>& callback) override;
|
| virtual void Embed(
|
| const String& url,
|
| - InterfaceRequest<ServiceProvider> service_provider) OVERRIDE;
|
| - virtual void DispatchOnViewInputEvent(EventPtr event) OVERRIDE;
|
| + InterfaceRequest<ServiceProvider> service_provider) override;
|
| + virtual void DispatchOnViewInputEvent(EventPtr event) override;
|
|
|
| // Overridden from WindowManagerClient:
|
| - virtual void OnWindowManagerReady() OVERRIDE;
|
| + virtual void OnWindowManagerReady() override;
|
| virtual void OnCaptureChanged(Id old_capture_view_id,
|
| - Id new_capture_view_id) OVERRIDE;
|
| + Id new_capture_view_id) override;
|
| virtual void OnFocusChanged(Id old_focused_view_id,
|
| - Id new_focused_view_id) OVERRIDE;
|
| + Id new_focused_view_id) override;
|
| virtual void OnActiveWindowChanged(Id old_focused_window,
|
| - Id new_focused_window) OVERRIDE;
|
| + Id new_focused_window) override;
|
|
|
| void RemoveRoot(View* root);
|
|
|
|
|