diff options
author | erg <erg@chromium.org> | 2015-03-27 16:35:59 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-27 23:36:49 +0000 |
commit | 617e549ee93838926d8c6a4de9d1f50209be3c7a (patch) | |
tree | 4a1229af76028a28eec4ff95abf01b6062107231 | |
parent | 0c6fe288d83e1fa0bf2e4e049f067587c29028e2 (diff) | |
download | chromium_src-617e549ee93838926d8c6a4de9d1f50209be3c7a.zip chromium_src-617e549ee93838926d8c6a4de9d1f50209be3c7a.tar.gz chromium_src-617e549ee93838926d8c6a4de9d1f50209be3c7a.tar.bz2 |
html_viewer: Run with a cookie jar.
Ever since https://codereview.chromium.org/710803002/, we haven't been
exposing a cookie jar or a clipboard to html_viewer. This looks like an
accident during refactoring.
BUG=
Review URL: https://codereview.chromium.org/1037423002
Cr-Commit-Position: refs/heads/master@{#322676}
-rw-r--r-- | mojo/services/html_viewer/mojo_blink_platform_impl.cc | 8 | ||||
-rw-r--r-- | mojo/services/html_viewer/mojo_blink_platform_impl.h | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/mojo/services/html_viewer/mojo_blink_platform_impl.cc b/mojo/services/html_viewer/mojo_blink_platform_impl.cc index 6b27ab16..ec11ec7 100644 --- a/mojo/services/html_viewer/mojo_blink_platform_impl.cc +++ b/mojo/services/html_viewer/mojo_blink_platform_impl.cc @@ -27,6 +27,14 @@ MojoBlinkPlatformImpl::MojoBlinkPlatformImpl(mojo::ApplicationImpl* app) { MojoBlinkPlatformImpl::~MojoBlinkPlatformImpl() { } +blink::WebCookieJar* MojoBlinkPlatformImpl::cookieJar() { + return cookie_jar_.get(); +} + +blink::WebClipboard* MojoBlinkPlatformImpl::clipboard() { + return clipboard_.get(); +} + blink::WebURLLoader* MojoBlinkPlatformImpl::createURLLoader() { return new WebURLLoaderImpl(network_service_.get()); } diff --git a/mojo/services/html_viewer/mojo_blink_platform_impl.h b/mojo/services/html_viewer/mojo_blink_platform_impl.h index aeb632d7..af3dd75 100644 --- a/mojo/services/html_viewer/mojo_blink_platform_impl.h +++ b/mojo/services/html_viewer/mojo_blink_platform_impl.h @@ -25,8 +25,10 @@ class MojoBlinkPlatformImpl : public BlinkPlatformImpl { private: // BlinkPlatform - virtual blink::WebURLLoader* createURLLoader() override; - virtual blink::WebSocketHandle* createWebSocketHandle() override; + blink::WebCookieJar* cookieJar() override; + blink::WebClipboard* clipboard() override; + blink::WebURLLoader* createURLLoader() override; + blink::WebSocketHandle* createWebSocketHandle() override; mojo::NetworkServicePtr network_service_; scoped_ptr<WebCookieJarImpl> cookie_jar_; |