diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2013-09-05 15:57:32 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-05 19:04:59 +0200 |
| commit | 967d6f420da6938ea759993062782f0e07ad961d (patch) | |
| tree | 9126620289f89046eedc82b16abb43e586ade9e2 | |
| parent | 7a83c1f222a495cab4afed7c314b9e0c87b23bc4 (diff) | |
WebContentsDelegateQt: Remove WebContents member
This is not needed anymore since the ownership changed
Change-Id: I7bfbb51c79a0d48ca8197a9b3a5d18986ee40e36
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| -rw-r--r-- | lib/web_contents_delegate_qt.cpp | 5 | ||||
| -rw-r--r-- | lib/web_contents_delegate_qt.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/web_contents_delegate_qt.cpp b/lib/web_contents_delegate_qt.cpp index 78de00620..e64649aea 100644 --- a/lib/web_contents_delegate_qt.cpp +++ b/lib/web_contents_delegate_qt.cpp @@ -50,8 +50,7 @@ #include "content/public/browser/invalidate_type.h" WebContentsDelegateQt::WebContentsDelegateQt(content::WebContents *webContents, WebContentsAdapterClient *adapterClient) - : m_webContents(webContents) - , m_viewClient(adapterClient) + : m_viewClient(adapterClient) { webContents->SetDelegate(this); Observe(webContents); @@ -60,7 +59,7 @@ WebContentsDelegateQt::WebContentsDelegateQt(content::WebContents *webContents, void WebContentsDelegateQt::NavigationStateChanged(const content::WebContents* source, unsigned changed_flags) { if (changed_flags & content::INVALIDATE_TYPE_URL) - m_viewClient->urlChanged(toQt(m_webContents->GetVisibleURL())); + m_viewClient->urlChanged(toQt(source->GetVisibleURL())); } void WebContentsDelegateQt::AddNewContents(content::WebContents* source, content::WebContents* new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture, bool* was_blocked) diff --git a/lib/web_contents_delegate_qt.h b/lib/web_contents_delegate_qt.h index 6568631b4..e56800571 100644 --- a/lib/web_contents_delegate_qt.h +++ b/lib/web_contents_delegate_qt.h @@ -66,7 +66,6 @@ public: virtual void DidFinishLoad(int64 frame_id, const GURL &validated_url, bool is_main_frame, content::RenderViewHost *render_view_host); private: - content::WebContents *m_webContents; WebContentsAdapterClient *m_viewClient; }; |