content/public/browser/web_contents.h - Issue 1411503005: Aura on Android: content/browser

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/public/browser/web_contents.h

Issue 1411503005: Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file

Patch Set: Addressing remaining feedback, cleaning up build files. Created 5 years, 1 month 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 side-by-side diff with in-line comments

Download patch

Index: content/public/browser/web_contents.h

diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h

index a991d907e31d52e87a3f4c1b01882b1943450e31..c1819ef904e1554c8e94d18232b805344cde75b3 100644

--- a/content/public/browser/web_contents.h

+++ b/content/public/browser/web_contents.h

@@ -687,10 +687,11 @@ class WebContents : public PageNavigator,

virtual void SuspendMediaSession() = 0;

// Requests to stop the current media session.

virtual void StopMediaSession() = 0;

+#if !defined(USE_AURA)

CONTENT_EXPORT static WebContents* FromJavaWebContents(

jobject jweb_contents_android);

virtual base::android::ScopedJavaLocalRef<jobject> GetJavaWebContents() = 0;

+#endif // !USE_AURA

#elif defined(OS_MACOSX)

// Allowing other views disables optimizations which assume that only a single

// WebContents is present.

« content/content_browser.gypi ('K') | « content/public/browser/native_web_keyboard_event.h ('k') | no next file » | no next file with comments »