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

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: rebased 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 virtual void ShowPastePopup(int x, int y) OVERRIDE; 59 virtual void ShowPastePopup(int x, int y) OVERRIDE;
60 virtual void GetScaledContentBitmap( 60 virtual void GetScaledContentBitmap(
61 float scale, 61 float scale,
62 gfx::Size* out_size, 62 gfx::Size* out_size,
63 const base::Callback<void(bool, const SkBitmap&)>& result_callback) 63 const base::Callback<void(bool, const SkBitmap&)>& result_callback)
64 OVERRIDE; 64 OVERRIDE;
65 virtual float GetDpiScale() const OVERRIDE; 65 virtual float GetDpiScale() const OVERRIDE;
66 virtual void RequestContentClipping(const gfx::Rect& clipping, 66 virtual void RequestContentClipping(const gfx::Rect& clipping,
67 const gfx::Size& content_size) OVERRIDE; 67 const gfx::Size& content_size) OVERRIDE;
68 virtual void PauseVideo() OVERRIDE; 68 virtual void PauseVideo() OVERRIDE;
69 virtual void ResumeVideo() OVERRIDE;
70 virtual void PauseOrResumeGeolocation(bool should_pause) OVERRIDE; 69 virtual void PauseOrResumeGeolocation(bool should_pause) OVERRIDE;
71 70
72 // -------------------------------------------------------------------------- 71 // --------------------------------------------------------------------------
73 // Methods called from Java via JNI 72 // Methods called from Java via JNI
74 // -------------------------------------------------------------------------- 73 // --------------------------------------------------------------------------
75 74
76 base::android::ScopedJavaLocalRef<jobject> GetWebContentsAndroid(JNIEnv* env, 75 base::android::ScopedJavaLocalRef<jobject> GetWebContentsAndroid(JNIEnv* env,
77 jobject obj); 76 jobject obj);
78 77
79 void OnJavaContentViewCoreDestroyed(JNIEnv* env, jobject obj); 78 void OnJavaContentViewCoreDestroyed(JNIEnv* env, jobject obj);
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 GestureEventPacket pending_gesture_packet_; 408 GestureEventPacket pending_gesture_packet_;
410 409
411 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); 410 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
412 }; 411 };
413 412
414 bool RegisterContentViewCore(JNIEnv* env); 413 bool RegisterContentViewCore(JNIEnv* env);
415 414
416 } // namespace content 415 } // namespace content
417 416
418 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 417 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/android/content_video_view.cc ('k') | content/browser/android/content_view_core_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698