| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h" | 5 #include "chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "chrome/browser/android/resource_mapper.h" | 10 #include "chrome/browser/android/resource_mapper.h" |
| 11 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_infobar_delegate.h" | 11 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_infobar_delegate.h" |
| 12 #include "content/public/browser/web_contents.h" | 12 #include "content/public/browser/web_contents.h" |
| 13 #include "jni/DataReductionProxyInfoBarDelegate_jni.h" | 13 #include "jni/DataReductionProxyInfoBarDelegate_jni.h" |
| 14 | 14 |
| 15 // DataReductionProxyInfoBar: | 15 // DataReductionProxyInfoBar: |
| 16 | 16 |
| 17 // static | 17 // static |
| 18 void DataReductionProxyInfoBar::Launch( | 18 void DataReductionProxyInfoBar::Launch( |
| 19 JNIEnv* env, jclass, jobject jweb_contents) { | 19 JNIEnv* env, jclass, jobject jweb_contents, jstring jlink_url) { |
| 20 content::WebContents* web_contents = | 20 content::WebContents* web_contents = |
| 21 content::WebContents::FromJavaWebContents(jweb_contents); | 21 content::WebContents::FromJavaWebContents(jweb_contents); |
| 22 DCHECK(web_contents); | 22 DCHECK(web_contents); |
| 23 DataReductionProxyInfoBarDelegate::Create(web_contents); | 23 DataReductionProxyInfoBarDelegate::Create( |
| 24 web_contents, base::android::ConvertJavaStringToUTF8(env, jlink_url)); |
| 24 } | 25 } |
| 25 | 26 |
| 26 // static | 27 // static |
| 27 bool DataReductionProxyInfoBar::Register(JNIEnv* env) { | 28 bool DataReductionProxyInfoBar::Register(JNIEnv* env) { |
| 28 return RegisterNativesImpl(env); | 29 return RegisterNativesImpl(env); |
| 29 } | 30 } |
| 30 | 31 |
| 31 DataReductionProxyInfoBar::DataReductionProxyInfoBar( | 32 DataReductionProxyInfoBar::DataReductionProxyInfoBar( |
| 32 scoped_ptr<DataReductionProxyInfoBarDelegate> delegate) | 33 scoped_ptr<DataReductionProxyInfoBarDelegate> delegate) |
| 33 : ConfirmInfoBar(delegate.PassAs<ConfirmInfoBarDelegate>()), | 34 : ConfirmInfoBar(delegate.PassAs<ConfirmInfoBarDelegate>()), |
| (...skipping 24 matching lines...) Expand all Loading... |
| 58 | 59 |
| 59 // static | 60 // static |
| 60 scoped_ptr<infobars::InfoBar> DataReductionProxyInfoBarDelegate::CreateInfoBar( | 61 scoped_ptr<infobars::InfoBar> DataReductionProxyInfoBarDelegate::CreateInfoBar( |
| 61 scoped_ptr<DataReductionProxyInfoBarDelegate> delegate) { | 62 scoped_ptr<DataReductionProxyInfoBarDelegate> delegate) { |
| 62 return scoped_ptr<infobars::InfoBar>( | 63 return scoped_ptr<infobars::InfoBar>( |
| 63 new DataReductionProxyInfoBar(delegate.Pass())); | 64 new DataReductionProxyInfoBar(delegate.Pass())); |
| 64 } | 65 } |
| 65 | 66 |
| 66 | 67 |
| 67 // JNI for DataReductionProxyInfoBarDelegate. | 68 // JNI for DataReductionProxyInfoBarDelegate. |
| 68 void Launch(JNIEnv* env, jclass clazz, jobject jweb_contents) { | 69 void |
| 69 DataReductionProxyInfoBar::Launch(env, clazz, jweb_contents); | 70 Launch(JNIEnv* env, jclass clazz, jobject jweb_contents, jstring jlink_url) { |
| 71 DataReductionProxyInfoBar::Launch(env, clazz, jweb_contents, jlink_url); |
| 70 } | 72 } |
| OLD | NEW |