| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/confirm_infobar.h" | 5 #include "chrome/browser/ui/android/infobars/confirm_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/infobars/confirm_infobar_delegate.h" | 11 #include "chrome/browser/infobars/confirm_infobar_delegate.h" |
| 12 #include "jni/ConfirmInfoBarDelegate_jni.h" | 12 #include "jni/ConfirmInfoBarDelegate_jni.h" |
| 13 | 13 |
| 14 | 14 |
| 15 // ConfirmInfoBarDelegate ----------------------------------------------------- | 15 // ConfirmInfoBarDelegate ----------------------------------------------------- |
| 16 | 16 |
| 17 // static | 17 // static |
| 18 scoped_ptr<InfoBar> ConfirmInfoBarDelegate::CreateInfoBar( | 18 scoped_ptr<infobars::InfoBar> ConfirmInfoBarDelegate::CreateInfoBar( |
| 19 scoped_ptr<ConfirmInfoBarDelegate> delegate) { | 19 scoped_ptr<ConfirmInfoBarDelegate> delegate) { |
| 20 return scoped_ptr<InfoBar>(new ConfirmInfoBar(delegate.Pass())); | 20 return scoped_ptr<infobars::InfoBar>(new ConfirmInfoBar(delegate.Pass())); |
| 21 } | 21 } |
| 22 | 22 |
| 23 | 23 |
| 24 // ConfirmInfoBar ------------------------------------------------------------- | 24 // ConfirmInfoBar ------------------------------------------------------------- |
| 25 | 25 |
| 26 ConfirmInfoBar::ConfirmInfoBar(scoped_ptr<ConfirmInfoBarDelegate> delegate) | 26 ConfirmInfoBar::ConfirmInfoBar(scoped_ptr<ConfirmInfoBarDelegate> delegate) |
| 27 : InfoBarAndroid(delegate.PassAs<InfoBarDelegate>()), | 27 : InfoBarAndroid(delegate.PassAs<infobars::InfoBarDelegate>()), |
| 28 java_confirm_delegate_() { | 28 java_confirm_delegate_() {} |
| 29 } | |
| 30 | 29 |
| 31 ConfirmInfoBar::~ConfirmInfoBar() { | 30 ConfirmInfoBar::~ConfirmInfoBar() { |
| 32 } | 31 } |
| 33 | 32 |
| 34 base::android::ScopedJavaLocalRef<jobject> ConfirmInfoBar::CreateRenderInfoBar( | 33 base::android::ScopedJavaLocalRef<jobject> ConfirmInfoBar::CreateRenderInfoBar( |
| 35 JNIEnv* env) { | 34 JNIEnv* env) { |
| 36 java_confirm_delegate_.Reset(Java_ConfirmInfoBarDelegate_create(env)); | 35 java_confirm_delegate_.Reset(Java_ConfirmInfoBarDelegate_create(env)); |
| 37 base::android::ScopedJavaLocalRef<jstring> ok_button_text = | 36 base::android::ScopedJavaLocalRef<jstring> ok_button_text = |
| 38 base::android::ConvertUTF16ToJavaString( | 37 base::android::ConvertUTF16ToJavaString( |
| 39 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_OK)); | 38 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_OK)); |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 return (delegate->GetButtons() & button) ? | 84 return (delegate->GetButtons() & button) ? |
| 86 delegate->GetButtonLabel(button) : base::string16(); | 85 delegate->GetButtonLabel(button) : base::string16(); |
| 87 } | 86 } |
| 88 | 87 |
| 89 | 88 |
| 90 // Native JNI methods --------------------------------------------------------- | 89 // Native JNI methods --------------------------------------------------------- |
| 91 | 90 |
| 92 bool RegisterConfirmInfoBarDelegate(JNIEnv* env) { | 91 bool RegisterConfirmInfoBarDelegate(JNIEnv* env) { |
| 93 return RegisterNativesImpl(env); | 92 return RegisterNativesImpl(env); |
| 94 } | 93 } |
| OLD | NEW |