blimp/client/test/test_blimp_client_context_delegate.cc - Issue 2191743002: Setup the delegate in Chrome, so we may put chrome java functions we need in blimp to the delegate …

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: blimp/client/test/test_blimp_client_context_delegate.cc

Issue 2191743002: Setup the delegate in Chrome, so we may put chrome java functions we need in blimp to the delegate … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resovle merge conflicts. Created 4 years, 5 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 side-by-side diff with in-line comments

Download patch

« blimp/client/test/test_blimp_client_context_delegate.h ('K') | « blimp/client/test/test_blimp_client_context_delegate.h ('k') | chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java » ('j') | chrome/browser/android/blimp/chrome_blimp_client_context_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: blimp/client/test/test_blimp_client_context_delegate.cc

diff --git a/blimp/client/test/test_blimp_client_context_delegate.cc b/blimp/client/test/test_blimp_client_context_delegate.cc

index 590c21416fde5a7ce84b5ae359d6889f1b9aa9d9..40494abc55fbac26b529dff5ad022866aabedd9a 100644

--- a/blimp/client/test/test_blimp_client_context_delegate.cc

+++ b/blimp/client/test/test_blimp_client_context_delegate.cc

@@ -24,5 +24,12 @@ TestBlimpClientContextDelegate::GetBlimpContentsWithLastAttachedHelpers() {

return blimp_contents_with_last_attached_helpers_;

}

+#if defined(OS_ANDROID)

+base::android::ScopedJavaLocalRef<jobject>

+ TestBlimpClientContextDelegate::GetJavaObject() {

+ return base::android::ScopedJavaLocalRef<jobject>();

+#endif // defined(OS_ANDROID)

} // namespace client

} // namespace blimp