Index: trunk/src/content/renderer/render_frame_impl.h |
=================================================================== |
--- trunk/src/content/renderer/render_frame_impl.h (revision 279559) |
+++ trunk/src/content/renderer/render_frame_impl.h (working copy) |
@@ -14,7 +14,6 @@ |
#include "base/memory/weak_ptr.h" |
#include "base/observer_list.h" |
#include "base/process/process_handle.h" |
-#include "content/common/mojo/service_registry_impl.h" |
#include "content/public/common/javascript_message_type.h" |
#include "content/public/common/referrer.h" |
#include "content/public/renderer/render_frame.h" |
@@ -223,7 +222,6 @@ |
blink::WebNavigationPolicy policy) OVERRIDE; |
virtual void ExecuteJavaScript(const base::string16& javascript) OVERRIDE; |
virtual bool IsHidden() OVERRIDE; |
- virtual ServiceRegistry* GetServiceRegistry() OVERRIDE; |
// blink::WebFrameClient implementation: |
virtual blink::WebPlugin* createPlugin(blink::WebLocalFrame* frame, |
@@ -399,11 +397,6 @@ |
// this back to private member. |
void OnNavigate(const FrameMsg_Navigate_Params& params); |
- // Binds this render frame's service registry to a handle to the remote |
- // service registry. |
- void BindServiceRegistry( |
- mojo::ScopedMessagePipeHandle service_provider_handle); |
- |
protected: |
RenderFrameImpl(RenderViewImpl* render_view, int32 routing_id); |
@@ -638,8 +631,6 @@ |
// The geolocation dispatcher attached to this view, lazily initialized. |
GeolocationDispatcher* geolocation_dispatcher_; |
- ServiceRegistryImpl service_registry_; |
- |
// The screen orientation dispatcher attached to the view, lazily initialized. |
ScreenOrientationDispatcher* screen_orientation_dispatcher_; |