Update BrowserContext and WebContentsDelegate for Chromium 44

Adds and changes interfaces to work with Chromium 44.

Change-Id: Id7c02e7b1be255d591f7ac5449dde5823c261eb5
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

1 files changed, 14 insertions, 5 deletions

diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index 865ee8e2c..93fabf15a 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -127,7 +127,7 @@ void WebContentsDelegateQt::AddNewContents(content::WebContents* source, content
 void WebContentsDelegateQt::CloseContents(content::WebContents *source)
 {
     m_viewClient->close();
-    GetJavaScriptDialogManager()->CancelActiveAndPendingDialogs(source);
+    GetJavaScriptDialogManager(source)->CancelActiveAndPendingDialogs(source);
 }
 
 void WebContentsDelegateQt::LoadProgressChanged(content::WebContents* source, double progress)
@@ -229,19 +229,28 @@ void WebContentsDelegateQt::DidUpdateFaviconURL(const std::vector<content::Favic
     }
 }
 
-content::JavaScriptDialogManager *WebContentsDelegateQt::GetJavaScriptDialogManager()
+content::JavaScriptDialogManager *WebContentsDelegateQt::GetJavaScriptDialogManager(content::WebContents *)
 {
     return JavaScriptDialogManagerQt::GetInstance();
 }
 
-void WebContentsDelegateQt::ToggleFullscreenModeForTab(content::WebContents* web_contents, bool enter_fullscreen)
+void WebContentsDelegateQt::EnterFullscreenModeForTab(content::WebContents *web_contents, const GURL& origin)
 {
-    if (m_viewClient->isFullScreen() != enter_fullscreen) {
-        m_viewClient->requestFullScreen(enter_fullscreen);
+    Q_UNUSED(origin); // FIXME
+    if (!m_viewClient->isFullScreen()) {
+        m_viewClient->requestFullScreen(true);
         web_contents->GetRenderViewHost()->WasResized();
     }
 }
 
+void WebContentsDelegateQt::ExitFullscreenModeForTab(content::WebContents *web_contents)
+{
+    if (m_viewClient->isFullScreen()) {
+        m_viewClient->requestFullScreen(false);
+        web_contents->GetRenderViewHost()->WasResized();
+     }
+}
+
 bool WebContentsDelegateQt::IsFullscreenForTabOrPending(const content::WebContents* web_contents) const
 {
     return m_viewClient->isFullScreen();