diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2019-02-05 14:50:22 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2019-02-05 16:56:24 +0100 |
| commit | 7aa06a1614b7ca6508d96ee2e8ef0f4c49038a6f (patch) | |
| tree | 4331533a6c0fa7a843c831d66e62472a7f8a4d30 /src/core/renderer/render_frame_observer_qt.h | |
| parent | 5e92adf5f85c4ec8340d5b7e92166a5e4f8e9883 (diff) | |
| parent | f17f815878d1d3f02f464347d2807555cab00a88 (diff) | |
Merge remote-tracking branch 'origin/dev' into 5.13
Conflicts:
src/core/content_browser_client_qt.cpp
src/core/content_browser_client_qt.h
Change-Id: I3da791a82dab56fd7535ba1e4c0ab1d9ca74f547
Diffstat (limited to 'src/core/renderer/render_frame_observer_qt.h')
| -rw-r--r-- | src/core/renderer/render_frame_observer_qt.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/renderer/render_frame_observer_qt.h b/src/core/renderer/render_frame_observer_qt.h index bca45bd8e..4c05422bb 100644 --- a/src/core/renderer/render_frame_observer_qt.h +++ b/src/core/renderer/render_frame_observer_qt.h @@ -44,6 +44,8 @@ #include "base/compiler_specific.h" #include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_frame_observer_tracker.h" +#include "ppapi/buildflags/buildflags.h" +#include "services/service_manager/public/cpp/binder_registry.h" namespace content { class RenderFrame; @@ -67,10 +69,13 @@ public: bool isFrameDetached() const; + service_manager::BinderRegistry* registry() { return ®istry_; } + private: DISALLOW_COPY_AND_ASSIGN(RenderFrameObserverQt); bool m_isFrameDetached; + service_manager::BinderRegistry registry_; }; } // namespace QtWebEngineCore |