| OLD | NEW |
| 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 "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
| 9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 | 433 |
| 434 jboolean WebContentsAndroid::IsRenderWidgetHostViewReady( | 434 jboolean WebContentsAndroid::IsRenderWidgetHostViewReady( |
| 435 JNIEnv* env, | 435 JNIEnv* env, |
| 436 const JavaParamRef<jobject>& obj) { | 436 const JavaParamRef<jobject>& obj) { |
| 437 RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid(); | 437 RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid(); |
| 438 return view && view->HasValidFrame(); | 438 return view && view->HasValidFrame(); |
| 439 } | 439 } |
| 440 | 440 |
| 441 void WebContentsAndroid::ExitFullscreen(JNIEnv* env, | 441 void WebContentsAndroid::ExitFullscreen(JNIEnv* env, |
| 442 const JavaParamRef<jobject>& obj) { | 442 const JavaParamRef<jobject>& obj) { |
| 443 web_contents_->ExitFullscreen(); | 443 web_contents_->ExitFullscreen(/*will_cause_resize=*/false); |
| 444 } | 444 } |
| 445 | 445 |
| 446 void WebContentsAndroid::UpdateTopControlsState( | 446 void WebContentsAndroid::UpdateTopControlsState( |
| 447 JNIEnv* env, | 447 JNIEnv* env, |
| 448 const JavaParamRef<jobject>& obj, | 448 const JavaParamRef<jobject>& obj, |
| 449 bool enable_hiding, | 449 bool enable_hiding, |
| 450 bool enable_showing, | 450 bool enable_showing, |
| 451 bool animate) { | 451 bool animate) { |
| 452 RenderViewHost* host = web_contents_->GetRenderViewHost(); | 452 RenderViewHost* host = web_contents_->GetRenderViewHost(); |
| 453 if (!host) | 453 if (!host) |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 690 if (response == READBACK_SUCCESS) | 690 if (response == READBACK_SUCCESS) |
| 691 java_bitmap = gfx::ConvertToJavaBitmap(&bitmap); | 691 java_bitmap = gfx::ConvertToJavaBitmap(&bitmap); |
| 692 Java_WebContentsImpl_onGetContentBitmapFinished(env, | 692 Java_WebContentsImpl_onGetContentBitmapFinished(env, |
| 693 obj->obj(), | 693 obj->obj(), |
| 694 callback->obj(), | 694 callback->obj(), |
| 695 java_bitmap.obj(), | 695 java_bitmap.obj(), |
| 696 response); | 696 response); |
| 697 } | 697 } |
| 698 | 698 |
| 699 } // namespace content | 699 } // namespace content |
| OLD | NEW |