Chromium Code Reviews| 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 71 } | 71 } |
| 72 | 72 |
| 73 void TranslateCompactInfoBar::SetJavaInfoBar( | 73 void TranslateCompactInfoBar::SetJavaInfoBar( |
| 74 const base::android::JavaRef<jobject>& java_info_bar) { | 74 const base::android::JavaRef<jobject>& java_info_bar) { |
| 75 InfoBarAndroid::SetJavaInfoBar(java_info_bar); | 75 InfoBarAndroid::SetJavaInfoBar(java_info_bar); |
| 76 JNIEnv* env = base::android::AttachCurrentThread(); | 76 JNIEnv* env = base::android::AttachCurrentThread(); |
| 77 Java_TranslateCompactInfoBar_setNativePtr(env, java_info_bar, | 77 Java_TranslateCompactInfoBar_setNativePtr(env, java_info_bar, |
| 78 reinterpret_cast<intptr_t>(this)); | 78 reinterpret_cast<intptr_t>(this)); |
| 79 } | 79 } |
| 80 | 80 |
| 81 void TranslateCompactInfoBar::ApplyTranslateOptions( | 81 void TranslateCompactInfoBar::ApplyStringTranslateOptions( |
|
gone
2017/04/12 16:16:07
You're only applying one option. Don't pluralize
ramyasharma
2017/04/13 04:04:07
Done.
| |
| 82 JNIEnv* env, | 82 JNIEnv* env, |
| 83 const JavaParamRef<jobject>& obj) { | 83 const JavaParamRef<jobject>& obj, |
| 84 // TODO(ramyasharma): Implement. | 84 int option, |
| 85 const JavaParamRef<jstring>& value) { | |
| 86 translate::TranslateInfoBarDelegate* delegate = GetDelegate(); | |
| 87 if (option == TranslateUtils::OPTION_SOURCE_CODE) { | |
| 88 std::string source_code = | |
| 89 base::android::ConvertJavaStringToUTF8(env, value); | |
| 90 if (delegate->original_language_code().compare(source_code) != 0) | |
| 91 delegate->UpdateOriginalLanguage(source_code); | |
| 92 } else if (option == TranslateUtils::OPTION_TARGET_CODE) { | |
| 93 std::string target_code = | |
| 94 base::android::ConvertJavaStringToUTF8(env, value); | |
| 95 if (delegate->target_language_code().compare(target_code) != 0) | |
| 96 delegate->UpdateTargetLanguage(target_code); | |
| 97 } | |
|
gone
2017/04/12 16:16:08
DCHECK in the else clause to prevent this function
ramyasharma
2017/04/13 04:04:07
Done.
| |
| 98 } | |
| 99 | |
| 100 void TranslateCompactInfoBar::ApplyBoolTranslateOptions( | |
| 101 JNIEnv* env, | |
| 102 const JavaParamRef<jobject>& obj, | |
| 103 int option, | |
| 104 bool value) { | |
|
gone
2017/04/12 16:16:08
I think this is supposed to be a jboolean, for con
ramyasharma
2017/04/13 04:04:07
Done.
| |
| 105 translate::TranslateInfoBarDelegate* delegate = GetDelegate(); | |
| 106 if (option == TranslateUtils::OPTION_ALWAYS_TRANSLATE) { | |
| 107 if (delegate->ShouldAlwaysTranslate() != value) | |
| 108 delegate->ToggleAlwaysTranslate(); | |
| 109 } else if (option == TranslateUtils::OPTION_NEVER_TRANSLATE) { | |
| 110 if (value && delegate->IsTranslatableLanguageByPrefs()) | |
| 111 delegate->ToggleTranslatableLanguageByPrefs(); | |
| 112 } else if (option == TranslateUtils::OPTION_NEVER_TRANSLATE_SITE) { | |
| 113 if (value && !delegate->IsSiteBlacklisted()) | |
| 114 delegate->ToggleSiteBlacklist(); | |
| 115 } | |
|
gone
2017/04/12 16:16:08
Ditto about else clause.
ramyasharma
2017/04/13 04:04:07
Thanks good idea. Done.
| |
| 85 } | 116 } |
| 86 | 117 |
| 87 void TranslateCompactInfoBar::OnPageTranslated( | 118 void TranslateCompactInfoBar::OnPageTranslated( |
| 88 const std::string& original_lang, | 119 const std::string& original_lang, |
| 89 const std::string& translated_lang, | 120 const std::string& translated_lang, |
| 90 translate::TranslateErrors::Type error_type) { | 121 translate::TranslateErrors::Type error_type) { |
| 91 if (!owner()) | 122 if (!owner()) |
| 92 return; // We're closing; don't call anything, it might access the owner. | 123 return; // We're closing; don't call anything, it might access the owner. |
| 93 | 124 |
| 94 DCHECK(translate_driver_); | 125 DCHECK(translate_driver_); |
| 95 JNIEnv* env = base::android::AttachCurrentThread(); | 126 JNIEnv* env = base::android::AttachCurrentThread(); |
| 96 Java_TranslateCompactInfoBar_onPageTranslated(env, GetJavaInfoBar(), | 127 Java_TranslateCompactInfoBar_onPageTranslated(env, GetJavaInfoBar(), |
| 97 error_type); | 128 error_type); |
| 98 } | 129 } |
| 99 | 130 |
| 100 translate::TranslateInfoBarDelegate* TranslateCompactInfoBar::GetDelegate() { | 131 translate::TranslateInfoBarDelegate* TranslateCompactInfoBar::GetDelegate() { |
| 101 return delegate()->AsTranslateInfoBarDelegate(); | 132 return delegate()->AsTranslateInfoBarDelegate(); |
| 102 } | 133 } |
| 103 | 134 |
| 104 // Native JNI methods --------------------------------------------------------- | 135 // Native JNI methods --------------------------------------------------------- |
| 105 | 136 |
| 106 // static | 137 // static |
| 107 bool RegisterTranslateCompactInfoBar(JNIEnv* env) { | 138 bool RegisterTranslateCompactInfoBar(JNIEnv* env) { |
| 108 return RegisterNativesImpl(env); | 139 return RegisterNativesImpl(env); |
| 109 } | 140 } |
| OLD | NEW |