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 f05f501ed29d34552f860647dd7446eedfb9b473..c87ee22f5ff693a83d50d4de940ea3a5a85c54b0 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.h |
+++ b/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.h |
@@ -55,10 +55,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()); |
@@ -67,7 +66,6 @@ class WindowProxyManagerImplHelper : public WindowProxyManagerBase { |
return static_cast<ProxyType*>(Base::windowProxy(world)); |
} |
- protected: |
explicit WindowProxyManagerImplHelper(Frame& frame) |
: WindowProxyManagerBase(frame) {} |
}; |
@@ -99,6 +97,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) {} |
}; |