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

Side by Side Diff: content/browser/android/content_view_core_impl.h

Issue 157783004: Partial revert of "Restart fullscreen video playback when switching back from background" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 virtual void LoadUrl(NavigationController::LoadURLParams& params) OVERRIDE; 57 virtual void LoadUrl(NavigationController::LoadURLParams& params) OVERRIDE;
58 virtual jint GetCurrentRenderProcessId(JNIEnv* env, jobject obj) OVERRIDE; 58 virtual jint GetCurrentRenderProcessId(JNIEnv* env, jobject obj) OVERRIDE;
59 virtual void ShowPastePopup(int x, int y) OVERRIDE; 59 virtual void ShowPastePopup(int x, int y) OVERRIDE;
60 virtual unsigned int GetScaledContentTexture( 60 virtual unsigned int GetScaledContentTexture(
61 float scale, 61 float scale,
62 gfx::Size* out_size) OVERRIDE; 62 gfx::Size* out_size) OVERRIDE;
63 virtual float GetDpiScale() const OVERRIDE; 63 virtual float GetDpiScale() const OVERRIDE;
64 virtual void RequestContentClipping(const gfx::Rect& clipping, 64 virtual void RequestContentClipping(const gfx::Rect& clipping,
65 const gfx::Size& content_size) OVERRIDE; 65 const gfx::Size& content_size) OVERRIDE;
66 virtual void PauseVideo() OVERRIDE; 66 virtual void PauseVideo() OVERRIDE;
67 virtual void ResumeVideo() OVERRIDE;
68 virtual void PauseOrResumeGeolocation(bool should_pause) OVERRIDE; 67 virtual void PauseOrResumeGeolocation(bool should_pause) OVERRIDE;
69 68
70 // -------------------------------------------------------------------------- 69 // --------------------------------------------------------------------------
71 // Methods called from Java via JNI 70 // Methods called from Java via JNI
72 // -------------------------------------------------------------------------- 71 // --------------------------------------------------------------------------
73 72
74 base::android::ScopedJavaLocalRef<jobject> GetWebContentsAndroid(JNIEnv* env, 73 base::android::ScopedJavaLocalRef<jobject> GetWebContentsAndroid(JNIEnv* env,
75 jobject obj); 74 jobject obj);
76 75
77 void OnJavaContentViewCoreDestroyed(JNIEnv* env, jobject obj); 76 void OnJavaContentViewCoreDestroyed(JNIEnv* env, jobject obj);
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 GestureEventPacket pending_gesture_packet_; 406 GestureEventPacket pending_gesture_packet_;
408 407
409 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); 408 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
410 }; 409 };
411 410
412 bool RegisterContentViewCore(JNIEnv* env); 411 bool RegisterContentViewCore(JNIEnv* env);
413 412
414 } // namespace content 413 } // namespace content
415 414
416 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 415 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698