Index: mojo/services/html_viewer/blink_platform_impl.h |
diff --git a/mojo/services/html_viewer/blink_platform_impl.h b/mojo/services/html_viewer/blink_platform_impl.h |
index d9f892182955eff4b48b08dd71feae52cf97b5ff..9b2e49e57ea1a0c87b8f590e7dee20569966b915 100644 |
--- a/mojo/services/html_viewer/blink_platform_impl.h |
+++ b/mojo/services/html_viewer/blink_platform_impl.h |
@@ -23,46 +23,46 @@ namespace html_viewer { |
class BlinkPlatformImpl : public blink::Platform { |
public: |
explicit BlinkPlatformImpl(); |
- ~BlinkPlatformImpl() override; |
+ virtual ~BlinkPlatformImpl(); |
// blink::Platform methods: |
- blink::WebMimeRegistry* mimeRegistry() override; |
- blink::WebThemeEngine* themeEngine() override; |
- blink::WebScheduler* scheduler() override; |
- blink::WebString defaultLocale() override; |
- double currentTime() override; |
- double monotonicallyIncreasingTime() override; |
- void cryptographicallyRandomValues(unsigned char* buffer, |
- size_t length) override; |
- void setSharedTimerFiredFunction(void (*func)()) override; |
- void setSharedTimerFireInterval(double interval_seconds) override; |
- void stopSharedTimer() override; |
+ virtual blink::WebMimeRegistry* mimeRegistry(); |
+ virtual blink::WebThemeEngine* themeEngine(); |
+ virtual blink::WebScheduler* scheduler(); |
+ virtual blink::WebString defaultLocale(); |
+ virtual double currentTime(); |
+ virtual double monotonicallyIncreasingTime(); |
+ virtual void cryptographicallyRandomValues(unsigned char* buffer, |
+ size_t length); |
+ virtual void setSharedTimerFiredFunction(void (*func)()); |
+ virtual void setSharedTimerFireInterval(double interval_seconds); |
+ virtual void stopSharedTimer(); |
virtual void callOnMainThread(void (*func)(void*), void* context); |
- bool isThreadedCompositingEnabled() override; |
- blink::WebCompositorSupport* compositorSupport() override; |
- blink::WebURLLoader* createURLLoader() override; |
- blink::WebSocketHandle* createWebSocketHandle() override; |
- blink::WebString userAgent() override; |
- blink::WebData parseDataURL( |
+ virtual bool isThreadedCompositingEnabled(); |
+ virtual blink::WebCompositorSupport* compositorSupport(); |
+ virtual blink::WebURLLoader* createURLLoader(); |
+ virtual blink::WebSocketHandle* createWebSocketHandle(); |
+ virtual blink::WebString userAgent(); |
+ virtual blink::WebData parseDataURL( |
const blink::WebURL& url, blink::WebString& mime_type, |
- blink::WebString& charset) override; |
- bool isReservedIPAddress(const blink::WebString& host) const override; |
- blink::WebURLError cancelledError(const blink::WebURL& url) const override; |
- blink::WebThread* createThread(const char* name) override; |
- blink::WebThread* currentThread() override; |
- void yieldCurrentThread() override; |
- blink::WebWaitableEvent* createWaitableEvent() override; |
- blink::WebWaitableEvent* waitMultipleEvents( |
- const blink::WebVector<blink::WebWaitableEvent*>& events) override; |
- blink::WebScrollbarBehavior* scrollbarBehavior() override; |
- const unsigned char* getTraceCategoryEnabledFlag( |
- const char* category_name) override; |
- blink::WebData loadResource(const char* name) override; |
- blink::WebGestureCurve* createFlingAnimationCurve( |
+ blink::WebString& charset); |
+ virtual bool isReservedIPAddress(const blink::WebString& host) const; |
+ virtual blink::WebURLError cancelledError(const blink::WebURL& url) const; |
+ virtual blink::WebThread* createThread(const char* name); |
+ virtual blink::WebThread* currentThread(); |
+ virtual void yieldCurrentThread(); |
+ virtual blink::WebWaitableEvent* createWaitableEvent(); |
+ virtual blink::WebWaitableEvent* waitMultipleEvents( |
+ const blink::WebVector<blink::WebWaitableEvent*>& events); |
+ virtual blink::WebScrollbarBehavior* scrollbarBehavior(); |
+ virtual const unsigned char* getTraceCategoryEnabledFlag( |
+ const char* category_name); |
+ virtual blink::WebData loadResource(const char* name); |
+ virtual blink::WebGestureCurve* createFlingAnimationCurve( |
blink::WebGestureDevice device_source, |
const blink::WebFloatPoint& velocity, |
- const blink::WebSize& cumulative_scroll) override; |
- blink::WebNotificationManager* notificationManager() override; |
+ const blink::WebSize& cumulative_scroll); |
+ virtual blink::WebNotificationManager* notificationManager(); |
private: |
void SuspendSharedTimer(); |