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

Unified Diff: blimp/client/test/test_blimp_client_context_delegate.h

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
Index: blimp/client/test/test_blimp_client_context_delegate.h
diff --git a/blimp/client/test/test_blimp_client_context_delegate.h b/blimp/client/test/test_blimp_client_context_delegate.h
index 977906cc55cb626528fd77565e41421b7ddefa0a..f9e6dfe4afc30c8ea49cfdaf8adca2c2c0962a23 100644
--- a/blimp/client/test/test_blimp_client_context_delegate.h
+++ b/blimp/client/test/test_blimp_client_context_delegate.h
@@ -8,6 +8,10 @@
#include "base/macros.h"
#include "blimp/client/public/blimp_client_context_delegate.h"
+#if defined(OS_ANDROID)
+ #include "base/android/jni_android.h"
+#endif // defined(OS_ANDROID)
+
namespace blimp {
namespace client {
class BlimpContents;
@@ -25,6 +29,12 @@ class TestBlimpClientContextDelegate : public BlimpClientContextDelegate {
// AttachBlimpContentsHelpers.
BlimpContents* GetBlimpContentsWithLastAttachedHelpers();
+#if defined(OS_ANDROID)
+ // Returns a Java object of the type BlimpClientContextDelegate.
nyquist 2016/07/28 19:15:34 Remove the comment and move it up to the "BlimpCli
xingliu 2016/07/28 22:43:09 Done.
+ base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override;
+#endif // defined(OS_ANDROID)
+
+
private:
// The last value of the parameter given to a call to
// AttachBlimpContentsHelpers.

Powered by Google App Engine
This is Rietveld 408576698