OLD | NEW |
1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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/translate_compact_infobar.h" | 5 #include "chrome/browser/ui/android/infobars/translate_compact_infobar.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
10 #include "base/android/jni_array.h" | 10 #include "base/android/jni_array.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 base::android::ScopedJavaLocalRef<jobjectArray> java_codes = | 44 base::android::ScopedJavaLocalRef<jobjectArray> java_codes = |
45 TranslateUtils::GetJavaLanguageCodes(env, delegate); | 45 TranslateUtils::GetJavaLanguageCodes(env, delegate); |
46 | 46 |
47 ScopedJavaLocalRef<jstring> source_language_code = | 47 ScopedJavaLocalRef<jstring> source_language_code = |
48 base::android::ConvertUTF8ToJavaString( | 48 base::android::ConvertUTF8ToJavaString( |
49 env, delegate->original_language_code()); | 49 env, delegate->original_language_code()); |
50 | 50 |
51 ScopedJavaLocalRef<jstring> target_language_code = | 51 ScopedJavaLocalRef<jstring> target_language_code = |
52 base::android::ConvertUTF8ToJavaString(env, | 52 base::android::ConvertUTF8ToJavaString(env, |
53 delegate->target_language_code()); | 53 delegate->target_language_code()); |
54 return Java_TranslateCompactInfoBar_create(env, source_language_code, | 54 return Java_TranslateCompactInfoBar_create( |
55 target_language_code, | 55 env, delegate->translate_step(), source_language_code, |
56 java_languages, java_codes); | 56 target_language_code, delegate->ShouldAlwaysTranslate(), |
| 57 delegate->triggered_from_menu(), java_languages, java_codes); |
57 } | 58 } |
58 | 59 |
59 void TranslateCompactInfoBar::ProcessButton(int action) { | 60 void TranslateCompactInfoBar::ProcessButton(int action) { |
60 if (!owner()) | 61 if (!owner()) |
61 return; // We're closing; don't call anything, it might access the owner. | 62 return; // We're closing; don't call anything, it might access the owner. |
62 | 63 |
63 // TODO(ramyasharma): Handle other button clicks. | 64 // TODO(ramyasharma): Handle other button clicks. |
64 translate::TranslateInfoBarDelegate* delegate = GetDelegate(); | 65 translate::TranslateInfoBarDelegate* delegate = GetDelegate(); |
65 if (action == InfoBarAndroid::ACTION_TRANSLATE) | 66 if (action == InfoBarAndroid::ACTION_TRANSLATE) |
66 delegate->Translate(); | 67 delegate->Translate(); |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 translate::TranslateInfoBarDelegate* TranslateCompactInfoBar::GetDelegate() { | 136 translate::TranslateInfoBarDelegate* TranslateCompactInfoBar::GetDelegate() { |
136 return delegate()->AsTranslateInfoBarDelegate(); | 137 return delegate()->AsTranslateInfoBarDelegate(); |
137 } | 138 } |
138 | 139 |
139 // Native JNI methods --------------------------------------------------------- | 140 // Native JNI methods --------------------------------------------------------- |
140 | 141 |
141 // static | 142 // static |
142 bool RegisterTranslateCompactInfoBar(JNIEnv* env) { | 143 bool RegisterTranslateCompactInfoBar(JNIEnv* env) { |
143 return RegisterNativesImpl(env); | 144 return RegisterNativesImpl(env); |
144 } | 145 } |
OLD | NEW |