Chromium Code Reviews| Index: third_party/WebKit/Source/core/frame/LocalFrame.h |
| diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.h b/third_party/WebKit/Source/core/frame/LocalFrame.h |
| index 8c253a2c72871d7642e885ae4ac6574b0f1342bb..60ec9cba017cc772adf923e7168fc934b0b8cd07 100644 |
| --- a/third_party/WebKit/Source/core/frame/LocalFrame.h |
| +++ b/third_party/WebKit/Source/core/frame/LocalFrame.h |
| @@ -71,6 +71,7 @@ class Range; |
| class LayoutView; |
| class TreeScope; |
| class ScriptController; |
| +class ServiceRegistry; |
| class SpellChecker; |
| class TreeScope; |
| class WebFrameHostScheduler; |
| @@ -80,7 +81,7 @@ template <typename Strategy> class PositionWithAffinityTemplate; |
| class CORE_EXPORT LocalFrame : public Frame, public LocalFrameLifecycleNotifier, public Supplementable<LocalFrame>, public DisplayItemClient { |
| USING_GARBAGE_COLLECTED_MIXIN(LocalFrame); |
| public: |
| - static LocalFrame* create(FrameLoaderClient*, FrameHost*, FrameOwner*); |
| + static LocalFrame* create(FrameLoaderClient*, FrameHost*, FrameOwner*, ServiceRegistry*); |
|
esprehn
2016/04/05 23:49:14
You could use a default argument = nullptr to avoi
Sam McNally
2016/04/06 01:32:53
Done.
|
| void init(); |
| void setView(FrameView*); |
| @@ -189,10 +190,12 @@ public: |
| bool isNavigationAllowed() const { return m_navigationDisableCount == 0; } |
| + ServiceRegistry* serviceRegistry() { return m_serviceRegistry; } |
| + |
| private: |
| friend class FrameNavigationDisabler; |
| - LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*); |
| + LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*, ServiceRegistry*); |
| bool shouldScrollTopControls(ScrollGranularity, const FloatSize& delta) const; |
| @@ -229,6 +232,8 @@ private: |
| bool m_inViewSourceMode; |
| Member<InstrumentingAgents> m_instrumentingAgents; |
| + |
| + ServiceRegistry* const m_serviceRegistry; |
| }; |
| inline void LocalFrame::init() |