Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Side by Side Diff: content/browser/web_contents/web_contents_android.cc

Issue 1488653002: Fix scroll restoration when exiting fullscreen mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Accidentally made will_cause_resize always false in previous cleanup. Fixed Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/web_contents/web_contents_android.h" 5 #include "content/browser/web_contents/web_contents_android.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_array.h" 10 #include "base/android/jni_array.h"
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 434
435 jboolean WebContentsAndroid::IsRenderWidgetHostViewReady( 435 jboolean WebContentsAndroid::IsRenderWidgetHostViewReady(
436 JNIEnv* env, 436 JNIEnv* env,
437 const JavaParamRef<jobject>& obj) { 437 const JavaParamRef<jobject>& obj) {
438 RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid(); 438 RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid();
439 return view && view->HasValidFrame(); 439 return view && view->HasValidFrame();
440 } 440 }
441 441
442 void WebContentsAndroid::ExitFullscreen(JNIEnv* env, 442 void WebContentsAndroid::ExitFullscreen(JNIEnv* env,
443 const JavaParamRef<jobject>& obj) { 443 const JavaParamRef<jobject>& obj) {
444 web_contents_->ExitFullscreen(); 444 web_contents_->ExitFullscreen(/*will_cause_resize=*/false);
445 } 445 }
446 446
447 void WebContentsAndroid::UpdateTopControlsState( 447 void WebContentsAndroid::UpdateTopControlsState(
448 JNIEnv* env, 448 JNIEnv* env,
449 const JavaParamRef<jobject>& obj, 449 const JavaParamRef<jobject>& obj,
450 bool enable_hiding, 450 bool enable_hiding,
451 bool enable_showing, 451 bool enable_showing,
452 bool animate) { 452 bool animate) {
453 RenderViewHost* host = web_contents_->GetRenderViewHost(); 453 RenderViewHost* host = web_contents_->GetRenderViewHost();
454 if (!host) 454 if (!host)
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 if (response == READBACK_SUCCESS) 692 if (response == READBACK_SUCCESS)
693 java_bitmap = gfx::ConvertToJavaBitmap(&bitmap); 693 java_bitmap = gfx::ConvertToJavaBitmap(&bitmap);
694 Java_WebContentsImpl_onGetContentBitmapFinished(env, 694 Java_WebContentsImpl_onGetContentBitmapFinished(env,
695 obj->obj(), 695 obj->obj(),
696 callback->obj(), 696 callback->obj(),
697 java_bitmap.obj(), 697 java_bitmap.obj(),
698 response); 698 response);
699 } 699 }
700 700
701 } // namespace content 701 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698