| Index: mojo/services/html_viewer/html_document.h
|
| diff --git a/mojo/services/html_viewer/html_document.h b/mojo/services/html_viewer/html_document.h
|
| index 13b46df6358855267388fce21c4b4535a6c8cc80..49b83ba756424a95af3e71a762f028995a741c62 100644
|
| --- a/mojo/services/html_viewer/html_document.h
|
| +++ b/mojo/services/html_viewer/html_document.h
|
| @@ -76,7 +76,7 @@ class HTMLDocument : public blink::WebViewClient,
|
| void UpdateWebviewSizeFromViewSize();
|
|
|
| // WebViewClient methods:
|
| - blink::WebStorageNamespace* createSessionStorageNamespace() override;
|
| + virtual blink::WebStorageNamespace* createSessionStorageNamespace();
|
|
|
| // WebWidgetClient methods:
|
| void initializeLayerTreeView() override;
|
| @@ -87,33 +87,33 @@ class HTMLDocument : public blink::WebViewClient,
|
| blink::WebLocalFrame* frame,
|
| const blink::WebURL& url,
|
| blink::WebMediaPlayerClient* client);
|
| - blink::WebMediaPlayer* createMediaPlayer(
|
| + virtual blink::WebMediaPlayer* createMediaPlayer(
|
| blink::WebLocalFrame* frame,
|
| const blink::WebURL& url,
|
| blink::WebMediaPlayerClient* client,
|
| - blink::WebContentDecryptionModule* initial_cdm) override;
|
| - blink::WebFrame* createChildFrame(
|
| + blink::WebContentDecryptionModule* initial_cdm);
|
| + virtual blink::WebFrame* createChildFrame(
|
| blink::WebLocalFrame* parent,
|
| const blink::WebString& frameName,
|
| - blink::WebSandboxFlags sandboxFlags) override;
|
| - void frameDetached(blink::WebFrame*) override;
|
| - blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame) override;
|
| - blink::WebNavigationPolicy decidePolicyForNavigation(
|
| + blink::WebSandboxFlags sandboxFlags);
|
| + virtual void frameDetached(blink::WebFrame*);
|
| + virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame);
|
| + virtual blink::WebNavigationPolicy decidePolicyForNavigation(
|
| blink::WebLocalFrame* frame,
|
| blink::WebDataSource::ExtraData* data,
|
| const blink::WebURLRequest& request,
|
| blink::WebNavigationType nav_type,
|
| blink::WebNavigationPolicy default_policy,
|
| - bool isRedirect) override;
|
| - void didAddMessageToConsole(const blink::WebConsoleMessage& message,
|
| - const blink::WebString& source_name,
|
| - unsigned source_line,
|
| - const blink::WebString& stack_trace) override;
|
| - void didFinishLoad(blink::WebLocalFrame* frame) override;
|
| - void didNavigateWithinPage(blink::WebLocalFrame* frame,
|
| - const blink::WebHistoryItem& history_item,
|
| - blink::WebHistoryCommitType commit_type) override;
|
| - blink::WebEncryptedMediaClient* encryptedMediaClient() override;
|
| + bool isRedirect);
|
| + virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message,
|
| + const blink::WebString& source_name,
|
| + unsigned source_line,
|
| + const blink::WebString& stack_trace);
|
| + virtual void didFinishLoad(blink::WebLocalFrame* frame);
|
| + virtual void didNavigateWithinPage(blink::WebLocalFrame* frame,
|
| + const blink::WebHistoryItem& history_item,
|
| + blink::WebHistoryCommitType commit_type);
|
| + virtual blink::WebEncryptedMediaClient* encryptedMediaClient();
|
|
|
| // ViewManagerDelegate methods:
|
| void OnEmbed(mojo::View* root,
|
|
|