Reduce duplicated code in AwWebContentsDelegate

android_webview/native/aw_web_contents_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/native/aw_web_contents_delegate.h"
 
 #include "android_webview/browser/aw_javascript_dialog_manager.h"
 #include "android_webview/browser/find_helper.h"
 #include "android_webview/native/aw_contents.h"
 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
@@ skipping 192 matching lines @@
                  scoped_ptr<content::MediaStreamUI>().Pass());
     return;
   }
   aw_contents->GetPermissionRequestHandler()->SendRequest(
       scoped_ptr<AwPermissionRequestDelegate>(
           new MediaAccessPermissionRequest(request, callback)));
 }
 
 void AwWebContentsDelegate::EnterFullscreenModeForTab(
     content::WebContents* web_contents, const GURL& origin) {
-  ToggleFullscreenModeForTab(web_contents, true);
+  WebContentsDelegateAndroid::EnterFullscreenModeForTab(web_contents, origin);
+  is_fullscreen_ = true;
+  web_contents->GetRenderViewHost()->WasResized();
 }
 
 void AwWebContentsDelegate::ExitFullscreenModeForTab(
     content::WebContents* web_contents) {
-  ToggleFullscreenModeForTab(web_contents, false);
-}
-
-void AwWebContentsDelegate::ToggleFullscreenModeForTab(
-    content::WebContents* web_contents, bool enter_fullscreen) {
-  JNIEnv* env = AttachCurrentThread();
-
-  ScopedJavaLocalRef<jobject> java_delegate = GetJavaDelegate(env);
-  if (java_delegate.obj()) {
-    Java_AwWebContentsDelegate_toggleFullscreenModeForTab(
-        env, java_delegate.obj(), enter_fullscreen);
-  }
-  is_fullscreen_ = enter_fullscreen;
-  web_contents->GetRenderViewHost()->WasResized();
+  is_fullscreen_ = false;
+  WebContentsDelegateAndroid::ExitFullscreenModeForTab(web_contents);

[Ignacio Solla, 2015/01/21 14:23:04]

aren't you misssing the call to

web_contents->GetRenderViewHost()->WasResized();

here?

[Hugo Holgersson, 2015/01/21 14:26:44]

Done.

 }
 
 bool AwWebContentsDelegate::IsFullscreenForTabOrPending(
     const content::WebContents* web_contents) const {
   return is_fullscreen_;
 }
 
 
 static void FilesSelectedInChooser(
     JNIEnv* env, jclass clazz,
@@ skipping 35 matching lines @@
   DVLOG(0) << "File Chooser result: mode = " << mode
            << ", file paths = " << JoinString(file_path_str, ":");
   rvh->FilesSelectedInChooser(files, mode);
 }
 
 bool RegisterAwWebContentsDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview