Index: content/renderer/render_frame_impl.h |
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h |
index 31f05cc374fdb4a98cd4b84702b5eae57a3f843b..d8cdfc38ac5acee76074e93d0edfdd5f1824d294 100644 |
--- a/content/renderer/render_frame_impl.h |
+++ b/content/renderer/render_frame_impl.h |
@@ -19,10 +19,10 @@ |
#include "content/public/common/javascript_message_type.h" |
#include "content/public/common/referrer.h" |
#include "content/public/renderer/render_frame.h" |
-#include "content/renderer/media/webmediaplayer_delegate.h" |
#include "content/renderer/render_frame_proxy.h" |
#include "content/renderer/renderer_webcookiejar_impl.h" |
#include "ipc/ipc_message.h" |
+#include "media/blink/webmediaplayer_delegate.h" |
#include "third_party/WebKit/public/web/WebAXObject.h" |
#include "third_party/WebKit/public/web/WebDataSource.h" |
#include "third_party/WebKit/public/web/WebFrameClient.h" |
@@ -83,7 +83,7 @@ struct CustomContextMenuContext; |
class CONTENT_EXPORT RenderFrameImpl |
: public RenderFrame, |
NON_EXPORTED_BASE(public blink::WebFrameClient), |
- NON_EXPORTED_BASE(public WebMediaPlayerDelegate) { |
+ NON_EXPORTED_BASE(public media::WebMediaPlayerDelegate) { |
public: |
// Creates a new RenderFrame. |render_view| is the RenderView object that this |
// frame belongs to. |