Index: mojo/services/html_viewer/blink_platform_impl.cc |
diff --git a/mojo/services/html_viewer/blink_platform_impl.cc b/mojo/services/html_viewer/blink_platform_impl.cc |
index 1981eb2c51ed0ceb94feb15d3b6cd772a38b855c..c5014a12e1b00906681b8ff88fa6cf837d2474ee 100644 |
--- a/mojo/services/html_viewer/blink_platform_impl.cc |
+++ b/mojo/services/html_viewer/blink_platform_impl.cc |
@@ -11,12 +11,7 @@ |
#include "base/synchronization/waitable_event.h" |
#include "base/threading/platform_thread.h" |
#include "base/time/time.h" |
-#include "mojo/public/cpp/application/application_impl.h" |
-#include "mojo/services/html_viewer/webclipboard_impl.h" |
-#include "mojo/services/html_viewer/webcookiejar_impl.h" |
-#include "mojo/services/html_viewer/websockethandle_impl.h" |
#include "mojo/services/html_viewer/webthread_impl.h" |
-#include "mojo/services/html_viewer/weburlloader_impl.h" |
#include "net/base/data_url.h" |
#include "net/base/mime_util.h" |
#include "net/base/net_errors.h" |
@@ -49,35 +44,18 @@ class WebWaitableEventImpl : public blink::WebWaitableEvent { |
} // namespace |
-BlinkPlatformImpl::BlinkPlatformImpl(ApplicationImpl* app) |
+BlinkPlatformImpl::BlinkPlatformImpl() |
: main_loop_(base::MessageLoop::current()), |
shared_timer_func_(NULL), |
shared_timer_fire_time_(0.0), |
shared_timer_fire_time_was_set_while_suspended_(false), |
shared_timer_suspended_(0), |
current_thread_slot_(&DestroyCurrentThread) { |
- app->ConnectToService("mojo:network_service", &network_service_); |
- |
- CookieStorePtr cookie_store; |
- network_service_->GetCookieStore(GetProxy(&cookie_store)); |
- cookie_jar_.reset(new WebCookieJarImpl(cookie_store.Pass())); |
- |
- ClipboardPtr clipboard; |
- app->ConnectToService("mojo:clipboard", &clipboard); |
- clipboard_.reset(new WebClipboardImpl(clipboard.Pass())); |
} |
BlinkPlatformImpl::~BlinkPlatformImpl() { |
} |
-blink::WebCookieJar* BlinkPlatformImpl::cookieJar() { |
- return cookie_jar_.get(); |
-} |
- |
-blink::WebClipboard* BlinkPlatformImpl::clipboard() { |
- return clipboard_.get(); |
-} |
- |
blink::WebMimeRegistry* BlinkPlatformImpl::mimeRegistry() { |
return &mime_registry_; |
} |
@@ -166,11 +144,11 @@ const unsigned char* BlinkPlatformImpl::getTraceCategoryEnabledFlag( |
} |
blink::WebURLLoader* BlinkPlatformImpl::createURLLoader() { |
- return new WebURLLoaderImpl(network_service_.get()); |
+ return NULL; |
} |
blink::WebSocketHandle* BlinkPlatformImpl::createWebSocketHandle() { |
- return new WebSocketHandleImpl(network_service_.get()); |
+ return NULL; |
} |
blink::WebString BlinkPlatformImpl::userAgent() { |