Chromium Code Reviews| Index: chrome/browser/android/blimp/chrome_blimp_client_context_delegate.cc |
| diff --git a/chrome/browser/android/blimp/chrome_blimp_client_context_delegate.cc b/chrome/browser/android/blimp/chrome_blimp_client_context_delegate.cc |
| index 278df7868d359640a42634b805809af806b30e3a..cd9d000974023357bf695ca3c557a76056ff6388 100644 |
| --- a/chrome/browser/android/blimp/chrome_blimp_client_context_delegate.cc |
| +++ b/chrome/browser/android/blimp/chrome_blimp_client_context_delegate.cc |
| @@ -11,6 +11,10 @@ |
| #include "chrome/browser/android/blimp/blimp_contents_profile_attachment.h" |
| #include "chrome/browser/profiles/profile.h" |
| +#if defined(OS_ANDROID) |
| +#include "chrome/browser/android/blimp/chrome_blimp_client_context_delegate_android.h" |
| +#endif // defined(OS_ANDROID) |
| + |
| ChromeBlimpClientContextDelegate::ChromeBlimpClientContextDelegate( |
| Profile* profile) |
| : profile_(profile), |
| @@ -23,6 +27,14 @@ ChromeBlimpClientContextDelegate::~ChromeBlimpClientContextDelegate() { |
| blimp_client_context_->SetDelegate(nullptr); |
| } |
| +#if defined(OS_ANDROID) |
| + |
|
nyquist
2016/08/01 18:24:07
Nit: Remove empty line.
|
| +base::android::ScopedJavaLocalRef<jobject> |
| +ChromeBlimpClientContextDelegate::GetJavaObject() { |
| + return base::android::ScopedJavaLocalRef<jobject>(); |
| +} |
| +#endif // defined(OS_ANDROID) |
| + |
| void ChromeBlimpClientContextDelegate::AttachBlimpContentsHelpers( |
| blimp::client::BlimpContents* blimp_contents) { |
| AttachProfileToBlimpContents(blimp_contents, profile_); |