| Index: sky/viewer/document_view.h
|
| diff --git a/sky/viewer/document_view.h b/sky/viewer/document_view.h
|
| index 3c57354cfa5ca134d6861c5443a0a855850eab2e..56568d5123f51dc26ffaeec96fbb5695098c818f 100644
|
| --- a/sky/viewer/document_view.h
|
| +++ b/sky/viewer/document_view.h
|
| @@ -23,6 +23,7 @@
|
| #include "sky/engine/public/web/WebFrameClient.h"
|
| #include "sky/engine/public/web/WebViewClient.h"
|
| #include "sky/viewer/services/inspector_impl.h"
|
| +#include "ui/events/gestures/gesture_types.h"
|
|
|
| namespace mojo {
|
| class ViewManager;
|
| @@ -42,18 +43,19 @@ class Layer;
|
| class LayerHost;
|
|
|
| class DocumentView : public blink::ServiceProvider,
|
| - public blink::WebViewClient,
|
| public blink::WebFrameClient,
|
| + public blink::WebViewClient,
|
| + public mojo::ViewManagerDelegate,
|
| + public mojo::ViewObserver,
|
| public sky::LayerClient,
|
| public sky::LayerHostClient,
|
| - public mojo::ViewManagerDelegate,
|
| - public mojo::ViewObserver {
|
| + public ui::GestureConsumer {
|
| public:
|
| DocumentView(mojo::InterfaceRequest<mojo::ServiceProvider> services,
|
| mojo::ServiceProviderPtr exported_services,
|
| mojo::URLResponsePtr response,
|
| mojo::Shell* shell);
|
| - virtual ~DocumentView();
|
| + ~DocumentView() override;
|
|
|
| base::WeakPtr<DocumentView> GetWeakPtr();
|
|
|
| @@ -121,6 +123,8 @@ class DocumentView : public blink::ServiceProvider,
|
| void OnViewDestroyed(mojo::View* view) override;
|
| void OnViewInputEvent(mojo::View* view, const mojo::EventPtr& event) override;
|
|
|
| + bool DispatchInputEvent(const mojo::EventPtr& event);
|
| +
|
| void Load(mojo::URLResponsePtr response);
|
| float GetDevicePixelRatio() const;
|
| scoped_ptr<Rasterizer> CreateRasterizer();
|
|
|