Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(398)

Side by Side Diff: chrome/browser/ui/android/infobars/translate_compact_infobar.cc

Issue 2838833003: Introduces snackbar enum, & other snackbar classes on android for translate (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
11 #include "base/android/jni_string.h" 11 #include "base/android/jni_string.h"
12 #include "base/android/jni_weak_ref.h" 12 #include "base/android/jni_weak_ref.h"
13 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
14 #include "chrome/browser/translate/android/translate_utils.h" 14 #include "chrome/browser/translate/android/translate_utils.h"
15 #include "chrome/browser/ui/android/snackbars/translate_snackbar.h"
15 #include "components/translate/core/browser/translate_infobar_delegate.h" 16 #include "components/translate/core/browser/translate_infobar_delegate.h"
16 #include "jni/TranslateCompactInfoBar_jni.h" 17 #include "jni/TranslateCompactInfoBar_jni.h"
17 18
18 using base::android::JavaParamRef; 19 using base::android::JavaParamRef;
19 using base::android::ScopedJavaLocalRef; 20 using base::android::ScopedJavaLocalRef;
20 21
21 // TranslateInfoBar ----------------------------------------------------------- 22 // TranslateInfoBar -----------------------------------------------------------
22 23
23 TranslateCompactInfoBar::TranslateCompactInfoBar( 24 TranslateCompactInfoBar::TranslateCompactInfoBar(
24 std::unique_ptr<translate::TranslateInfoBarDelegate> delegate) 25 std::unique_ptr<translate::TranslateInfoBarDelegate> delegate)
25 : InfoBarAndroid(std::move(delegate)) { 26 : InfoBarAndroid(std::move(delegate)) {
26 // |translate_driver| must already be bound. 27 // |translate_driver| must already be bound.
27 DCHECK(GetDelegate()->GetTranslateDriver()); 28 DCHECK(GetDelegate()->GetTranslateDriver());
28 translate_driver_ = static_cast<translate::ContentTranslateDriver*>( 29 translate_driver_ = static_cast<translate::ContentTranslateDriver*>(
29 GetDelegate()->GetTranslateDriver()); 30 GetDelegate()->GetTranslateDriver());
30 translate_driver_->AddObserver(this); 31 translate_driver_->AddObserver(this);
32 snackbar_type_ = TranslateUtils::TYPE_NONE;
31 } 33 }
32 34
33 TranslateCompactInfoBar::~TranslateCompactInfoBar() { 35 TranslateCompactInfoBar::~TranslateCompactInfoBar() {
34 DCHECK(translate_driver_); 36 DCHECK(translate_driver_);
35 translate_driver_->RemoveObserver(this); 37 translate_driver_->RemoveObserver(this);
36 } 38 }
37 39
38 ScopedJavaLocalRef<jobject> TranslateCompactInfoBar::CreateRenderInfoBar( 40 ScopedJavaLocalRef<jobject> TranslateCompactInfoBar::CreateRenderInfoBar(
39 JNIEnv* env) { 41 JNIEnv* env) {
40 translate::TranslateInfoBarDelegate* delegate = GetDelegate(); 42 translate::TranslateInfoBarDelegate* delegate = GetDelegate();
(...skipping 30 matching lines...) Expand all
71 } 73 }
72 74
73 void TranslateCompactInfoBar::SetJavaInfoBar( 75 void TranslateCompactInfoBar::SetJavaInfoBar(
74 const base::android::JavaRef<jobject>& java_info_bar) { 76 const base::android::JavaRef<jobject>& java_info_bar) {
75 InfoBarAndroid::SetJavaInfoBar(java_info_bar); 77 InfoBarAndroid::SetJavaInfoBar(java_info_bar);
76 JNIEnv* env = base::android::AttachCurrentThread(); 78 JNIEnv* env = base::android::AttachCurrentThread();
77 Java_TranslateCompactInfoBar_setNativePtr(env, java_info_bar, 79 Java_TranslateCompactInfoBar_setNativePtr(env, java_info_bar,
78 reinterpret_cast<intptr_t>(this)); 80 reinterpret_cast<intptr_t>(this));
79 } 81 }
80 82
83 void TranslateCompactInfoBar::ShowSnackbar(JNIEnv* env,
84 const JavaParamRef<jobject>& obj) {
85 if (GetJavaInfoBar() != nullptr) {
gone 2017/04/27 18:42:45 early return like line 62. if (!GetJavaInfoBar())
ramyasharma 2017/04/28 00:37:34 Done.
86 JNIEnv* env = base::android::AttachCurrentThread();
87 TranslateSnackbar* snackbar = new TranslateSnackbar(snackbar_type_);
gone 2017/04/27 18:42:45 This is a memory leak; you never delete it.
ramyasharma 2017/04/28 00:37:34 Oh, thanks . Done.
88 Java_TranslateCompactInfoBar_showSnackbar(
89 env, GetJavaInfoBar(), snackbar_type_,
90 reinterpret_cast<intptr_t>(snackbar));
91 }
92 }
93
81 void TranslateCompactInfoBar::ApplyStringTranslateOption( 94 void TranslateCompactInfoBar::ApplyStringTranslateOption(
82 JNIEnv* env, 95 JNIEnv* env,
83 const JavaParamRef<jobject>& obj, 96 const JavaParamRef<jobject>& obj,
84 int option, 97 int option,
85 const JavaParamRef<jstring>& value) { 98 const JavaParamRef<jstring>& value) {
86 translate::TranslateInfoBarDelegate* delegate = GetDelegate(); 99 translate::TranslateInfoBarDelegate* delegate = GetDelegate();
87 if (option == TranslateUtils::OPTION_SOURCE_CODE) { 100 if (option == TranslateUtils::OPTION_SOURCE_CODE) {
88 std::string source_code = 101 std::string source_code =
89 base::android::ConvertJavaStringToUTF8(env, value); 102 base::android::ConvertJavaStringToUTF8(env, value);
90 if (delegate->original_language_code().compare(source_code) != 0) 103 if (delegate->original_language_code().compare(source_code) != 0)
91 delegate->UpdateOriginalLanguage(source_code); 104 delegate->UpdateOriginalLanguage(source_code);
92 } else if (option == TranslateUtils::OPTION_TARGET_CODE) { 105 } else if (option == TranslateUtils::OPTION_TARGET_CODE) {
93 std::string target_code = 106 std::string target_code =
94 base::android::ConvertJavaStringToUTF8(env, value); 107 base::android::ConvertJavaStringToUTF8(env, value);
95 if (delegate->target_language_code().compare(target_code) != 0) 108 if (delegate->target_language_code().compare(target_code) != 0)
96 delegate->UpdateTargetLanguage(target_code); 109 delegate->UpdateTargetLanguage(target_code);
97 } else { 110 } else {
98 DCHECK(false); 111 DCHECK(false);
99 } 112 }
100 } 113 }
101 114
102 void TranslateCompactInfoBar::ApplyBoolTranslateOption( 115 void TranslateCompactInfoBar::ApplyBoolTranslateOption(
103 JNIEnv* env, 116 JNIEnv* env,
104 const JavaParamRef<jobject>& obj, 117 const JavaParamRef<jobject>& obj,
105 int option, 118 int option,
106 jboolean value) { 119 jboolean value) {
107 translate::TranslateInfoBarDelegate* delegate = GetDelegate(); 120 translate::TranslateInfoBarDelegate* delegate = GetDelegate();
108 if (option == TranslateUtils::OPTION_ALWAYS_TRANSLATE) { 121 if (option == TranslateUtils::OPTION_ALWAYS_TRANSLATE) {
109 if (delegate->ShouldAlwaysTranslate() != value) 122 if (delegate->ShouldAlwaysTranslate() != value) {
110 delegate->ToggleAlwaysTranslate(); 123 delegate->ToggleAlwaysTranslate();
124 snackbar_type_ = TranslateUtils::TYPE_ALWAYS_TRANSLATE;
125 }
111 } else if (option == TranslateUtils::OPTION_NEVER_TRANSLATE) { 126 } else if (option == TranslateUtils::OPTION_NEVER_TRANSLATE) {
112 if (value && delegate->IsTranslatableLanguageByPrefs()) 127 if (value && delegate->IsTranslatableLanguageByPrefs()) {
113 delegate->ToggleTranslatableLanguageByPrefs(); 128 delegate->ToggleTranslatableLanguageByPrefs();
129 snackbar_type_ = TranslateUtils::TYPE_NEVER_TRANSLATE;
130 }
114 } else if (option == TranslateUtils::OPTION_NEVER_TRANSLATE_SITE) { 131 } else if (option == TranslateUtils::OPTION_NEVER_TRANSLATE_SITE) {
115 if (value && !delegate->IsSiteBlacklisted()) 132 if (value && !delegate->IsSiteBlacklisted()) {
116 delegate->ToggleSiteBlacklist(); 133 delegate->ToggleSiteBlacklist();
134 snackbar_type_ = TranslateUtils::TYPE_NEVER_TRANSLATE_SITE;
135 }
117 } else { 136 } else {
118 DCHECK(false); 137 DCHECK(false);
119 } 138 }
120 } 139 }
121 140
122 void TranslateCompactInfoBar::OnPageTranslated( 141 void TranslateCompactInfoBar::OnPageTranslated(
123 const std::string& original_lang, 142 const std::string& original_lang,
124 const std::string& translated_lang, 143 const std::string& translated_lang,
125 translate::TranslateErrors::Type error_type) { 144 translate::TranslateErrors::Type error_type) {
126 if (!owner()) 145 if (!owner())
127 return; // We're closing; don't call anything, it might access the owner. 146 return; // We're closing; don't call anything, it might access the owner.
128 147
129 DCHECK(translate_driver_); 148 DCHECK(translate_driver_);
130 JNIEnv* env = base::android::AttachCurrentThread(); 149 JNIEnv* env = base::android::AttachCurrentThread();
131 Java_TranslateCompactInfoBar_onPageTranslated(env, GetJavaInfoBar(), 150 Java_TranslateCompactInfoBar_onPageTranslated(env, GetJavaInfoBar(),
132 error_type); 151 error_type);
133 } 152 }
134 153
135 translate::TranslateInfoBarDelegate* TranslateCompactInfoBar::GetDelegate() { 154 translate::TranslateInfoBarDelegate* TranslateCompactInfoBar::GetDelegate() {
136 return delegate()->AsTranslateInfoBarDelegate(); 155 return delegate()->AsTranslateInfoBarDelegate();
137 } 156 }
138 157
139 // Native JNI methods --------------------------------------------------------- 158 // Native JNI methods ---------------------------------------------------------
140 159
141 // static 160 // static
142 bool RegisterTranslateCompactInfoBar(JNIEnv* env) { 161 bool RegisterTranslateCompactInfoBar(JNIEnv* env) {
143 return RegisterNativesImpl(env); 162 return RegisterNativesImpl(env);
144 } 163 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698