| Index: content/public/browser/web_contents.h
|
| diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
|
| index 1662c395a14c9d96add186837e22d26cfb08f541..9dd14bf78eff4037f2b3b5cde7239577e1ce5731 100644
|
| --- a/content/public/browser/web_contents.h
|
| +++ b/content/public/browser/web_contents.h
|
| @@ -697,7 +697,6 @@ class WebContents : public PageNavigator,
|
| // as soon as they are ready.
|
| virtual void ResumeLoadingCreatedWebContents() = 0;
|
|
|
| -#if defined(OS_ANDROID)
|
| // Requests to resume the current media session.
|
| virtual void ResumeMediaSession() = 0;
|
| // Requests to suspend the current media session.
|
| @@ -705,6 +704,7 @@ class WebContents : public PageNavigator,
|
| // Requests to stop the current media session.
|
| virtual void StopMediaSession() = 0;
|
|
|
| +#if defined(OS_ANDROID)
|
| CONTENT_EXPORT static WebContents* FromJavaWebContents(
|
| jobject jweb_contents_android);
|
| virtual base::android::ScopedJavaLocalRef<jobject> GetJavaWebContents() = 0;
|
|
|