Index: third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.h |
diff --git a/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.h b/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.h |
index a70c384d0242296dd1daa1e7f12bc0ca2fe7d931..44adedcb3a4fb5d6dec53237e0dff0992278c8c5 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.h |
+++ b/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.h |
@@ -54,10 +54,9 @@ class WindowProxyManagerBase : public GarbageCollected<WindowProxyManagerBase> { |
template <typename FrameType, typename ProxyType> |
class WindowProxyManagerImplHelper : public WindowProxyManagerBase { |
- private: |
+ protected: |
using Base = WindowProxyManagerBase; |
- public: |
FrameType* frame() const { return static_cast<FrameType*>(Base::frame()); } |
ProxyType* mainWorldProxy() const { |
return static_cast<ProxyType*>(Base::mainWorldProxy()); |
@@ -66,7 +65,6 @@ class WindowProxyManagerImplHelper : public WindowProxyManagerBase { |
return static_cast<ProxyType*>(Base::windowProxy(world)); |
} |
- protected: |
explicit WindowProxyManagerImplHelper(Frame& frame) |
: WindowProxyManagerBase(frame) {} |
}; |
@@ -98,6 +96,10 @@ class RemoteWindowProxyManager |
} |
private: |
+ // TODO(dcheng): Ideally, remove this friend declaration once WindowProxy |
+ // initialization details are better encapsulated. |
+ friend class RemoteFrame; |
+ |
explicit RemoteWindowProxyManager(RemoteFrame& frame) |
: WindowProxyManagerImplHelper<RemoteFrame, RemoteWindowProxy>(frame) {} |
}; |