Index: content/child/blink_platform_impl.cc |
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc |
index efbe71f21c1650b24554cc2e74cc4b5df64b6ec1..329c8492d2e47d62b99aedb05d2bc60697207467 100644 |
--- a/content/child/blink_platform_impl.cc |
+++ b/content/child/blink_platform_impl.cc |
@@ -32,6 +32,7 @@ |
#include "content/child/child_thread.h" |
#include "content/child/content_child_helpers.h" |
#include "content/child/fling_curve_configuration.h" |
+#include "content/child/geofencing/web_geofencing_provider_impl.h" |
#include "content/child/web_discardable_memory_impl.h" |
#include "content/child/web_socket_stream_handle_impl.h" |
#include "content/child/web_url_loader_impl.h" |
@@ -412,7 +413,13 @@ BlinkPlatformImpl::BlinkPlatformImpl() |
shared_timer_fire_time_was_set_while_suspended_(false), |
shared_timer_suspended_(0), |
fling_curve_configuration_(new FlingCurveConfiguration), |
- current_thread_slot_(&DestroyCurrentThread) {} |
+ current_thread_slot_(&DestroyCurrentThread) { |
+ // ChildThread may not exist in some tests. |
+ if (ChildThread::current()) { |
+ geofencing_provider_.reset(new WebGeofencingProviderImpl( |
+ ChildThread::current()->thread_safe_sender())); |
+ } |
+} |
BlinkPlatformImpl::~BlinkPlatformImpl() { |
} |
@@ -995,6 +1002,9 @@ blink::WebCrypto* BlinkPlatformImpl::crypto() { |
return &web_crypto_; |
} |
+blink::WebGeofencingProvider* BlinkPlatformImpl::geofencingProvider() { |
jochen (gone - plz use gerrit)
2014/09/17 18:26:44
the WebGeofencingProvider only exists on the main
Marijn Kruisselbrink
2014/09/18 16:32:05
No, that's not right. Just like the WebCrypto abov
|
+ return geofencing_provider_.get(); |
+} |
WebThemeEngine* BlinkPlatformImpl::themeEngine() { |
return &native_theme_engine_; |