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

Unified Diff: chrome/browser/android/blimp/chrome_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: chrome/browser/android/blimp/chrome_blimp_client_context_delegate.h
diff --git a/chrome/browser/android/blimp/chrome_blimp_client_context_delegate.h b/chrome/browser/android/blimp/chrome_blimp_client_context_delegate.h
index c41765df005ba89232b769e01d0536d3d1bd3920..fbf81fec100924d97f15015ac73197e0ffba2226 100644
--- a/chrome/browser/android/blimp/chrome_blimp_client_context_delegate.h
+++ b/chrome/browser/android/blimp/chrome_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)
+
class Profile;
namespace blimp {
@@ -28,6 +32,10 @@ class ChromeBlimpClientContextDelegate
// Unattaches itself from the BlimpClientContext before going away.
~ChromeBlimpClientContextDelegate() override;
+#if defined(OS_ANDROID)
+ base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override;
nyquist 2016/07/28 19:15:34 Can this be removed from this class, since it's ne
xingliu 2016/07/28 22:43:09 Done, but didn't change it to abstract class.
+#endif
+
// BlimpClientContextDelegate implementation.
void AttachBlimpContentsHelpers(
blimp::client::BlimpContents* blimp_contents) override;

Powered by Google App Engine
This is Rietveld 408576698