Index: third_party/WebKit/Source/web/WebLocalFrameImpl.h |
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.h b/third_party/WebKit/Source/web/WebLocalFrameImpl.h |
index cf1f229ebd2d98377ee9839e46b095d6ccf58bd3..5d3c4c2390c3ff32ca1fb11102eb5b509ffa4485 100644 |
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.h |
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.h |
@@ -43,7 +43,6 @@ |
#include "web/LocalFrameClientImpl.h" |
#include "web/UserMediaClientImpl.h" |
#include "web/WebExport.h" |
-#include "web/WebFrameImplBase.h" |
#include "web/WebFrameWidgetBase.h" |
#include "web/WebInputMethodControllerImpl.h" |
@@ -84,7 +83,7 @@ class WebVector; |
// Implementation of WebFrame, note that this is a reference counted object. |
class WEB_EXPORT WebLocalFrameImpl final |
- : public WebFrameImplBase, |
+ : public GarbageCollectedFinalized<WebLocalFrameImpl>, |
NON_EXPORTED_BASE(public WebLocalFrame) { |
public: |
// WebFrame methods: |
@@ -239,8 +238,6 @@ class WEB_EXPORT WebLocalFrameImpl final |
WebString LayerTreeAsText(bool show_debug_info = false) const override; |
- WebFrameImplBase* ToImplBase() override { return this; } |
- |
// WebLocalFrame methods: |
void SetAutofillClient(WebAutofillClient*) override; |
WebAutofillClient* AutofillClient() override; |
@@ -321,11 +318,9 @@ class WEB_EXPORT WebLocalFrameImpl final |
WebString& clip_text, |
WebString& clip_html) override; |
- // WebFrameImplBase methods: |
- void InitializeCoreFrame(Page&, |
- FrameOwner*, |
- const AtomicString& name) override; |
- LocalFrame* GetFrame() const override { return frame_.Get(); } |
+ // TODO(mustaq): regroup these to WebFrame or WebLocalFrame |
+ void InitializeCoreFrame(Page&, FrameOwner*, const AtomicString& name); |
+ LocalFrame* GetFrame() const { return frame_.Get(); } |
void WillBeDetached(); |
void WillDetachParent(); |