Chromium Code Reviews| Index: third_party/WebKit/Source/core/frame/RemoteFrame.h |
| diff --git a/third_party/WebKit/Source/core/frame/RemoteFrame.h b/third_party/WebKit/Source/core/frame/RemoteFrame.h |
| index 777c92d9de35c547fbfe79347f242a982bebec0f..412ec72e8d15f67ed8c9d8f960afda2706855fd7 100644 |
| --- a/third_party/WebKit/Source/core/frame/RemoteFrame.h |
| +++ b/third_party/WebKit/Source/core/frame/RemoteFrame.h |
| @@ -17,8 +17,8 @@ class IntRect; |
| class LocalFrame; |
| class RemoteFrameClient; |
| class RemoteFrameView; |
| +class RemoteWindowProxyManager; |
| class WebLayer; |
| -class WindowProxyManager; |
| struct FrameLoadRequest; |
| class CORE_EXPORT RemoteFrame final : public Frame { |
| @@ -68,9 +68,8 @@ class CORE_EXPORT RemoteFrame final : public Frame { |
| RemoteFrame(RemoteFrameClient*, FrameHost*, FrameOwner*); |
| // Internal Frame helper overrides: |
| - WindowProxyManager* getWindowProxyManager() const override { |
| - return m_windowProxyManager.get(); |
| - } |
| + WindowProxyManagerBase* getWindowProxyManager() const override; |
|
Yuki
2017/01/11 10:09:24
nit: Why not RemoteWindowProxyManager?
dcheng
2017/01/11 10:35:29
Ditto.
|
| + |
| // Intentionally private to prevent redundant checks when the type is |
| // already RemoteFrame. |
| bool isLocalFrame() const override { return false; } |
| @@ -80,7 +79,7 @@ class CORE_EXPORT RemoteFrame final : public Frame { |
| Member<RemoteFrameView> m_view; |
| Member<RemoteSecurityContext> m_securityContext; |
| - Member<WindowProxyManager> m_windowProxyManager; |
| + Member<RemoteWindowProxyManager> m_windowProxyManager; |
| WebLayer* m_webLayer = nullptr; |
| }; |