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

Unified Diff: chrome/browser/translate/translate_ui_delegate.cc

Issue 64823005: Copy the implementations of TranslateUIDelegate to TransalteInfobarDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 7 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/translate/translate_ui_delegate.cc
diff --git a/chrome/browser/translate/translate_ui_delegate.cc b/chrome/browser/translate/translate_ui_delegate.cc
index ee2f009eab27fbf378de8b2fc0f396c34b8ddb32..c840589aeb8dd44b28994d1e2ad205f6dc6f4c75 100644
--- a/chrome/browser/translate/translate_ui_delegate.cc
+++ b/chrome/browser/translate/translate_ui_delegate.cc
@@ -8,6 +8,7 @@
#include "base/metrics/histogram.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/translate/translate_browser_metrics.h"
#include "chrome/browser/translate/translate_manager.h"
#include "chrome/browser/translate/translate_prefs.h"
#include "chrome/browser/translate/translate_tab_helper.h"
@@ -18,70 +19,74 @@
#include "third_party/icu/source/i18n/unicode/coll.h"
#include "ui/base/l10n/l10n_util.h"
-namespace {
-
-const char kDeclineTranslate[] = "Translate.DeclineTranslate";
-const char kRevertTranslation[] = "Translate.RevertTranslation";
-const char kPerformTranslate[] = "Translate.Translate";
-const char kNeverTranslateLang[] = "Translate.NeverTranslateLang";
-const char kNeverTranslateSite[] = "Translate.NeverTranslateSite";
-const char kAlwaysTranslateLang[] = "Translate.AlwaysTranslateLang";
-const char kModifyOriginalLang[] = "Translate.ModifyOriginalLang";
-const char kModifyTargetLang[] = "Translate.ModifyTargetLang";
-
-} // namespace
-
TranslateUIDelegate::TranslateUIDelegate(content::WebContents* web_contents,
const std::string& original_language,
const std::string& target_language)
: web_contents_(web_contents),
original_language_index_(NO_INDEX),
- initial_original_language_index_(NO_INDEX),
target_language_index_(NO_INDEX) {
+ GetSortedLanguageNames(g_browser_process->GetApplicationLocale(),
+ &languages_);
+
+ for (std::vector<LanguageNamePair>::const_iterator iter = languages_.begin();
+ iter != languages_.end(); ++iter) {
+ std::string language_code = iter->first;
+ if (language_code == original_language)
+ original_language_index_ = iter - languages_.begin();
+ if (language_code == target_language)
+ target_language_index_ = iter - languages_.begin();
+ }
+
+ Profile* profile =
+ Profile::FromBrowserContext(web_contents->GetBrowserContext());
+ prefs_.reset(new TranslatePrefs(profile->GetPrefs()));
+}
+
+TranslateUIDelegate::~TranslateUIDelegate() {
+}
+
+// static
+void TranslateUIDelegate::GetSortedLanguageNames(
+ const std::string& locale,
+ std::vector<LanguageNamePair>* language_names) {
+ DCHECK(language_names->empty());
+
std::vector<std::string> language_codes;
TranslateManager::GetSupportedLanguages(&language_codes);
// Preparing for the alphabetical order in the locale.
UErrorCode error = U_ZERO_ERROR;
- std::string locale = g_browser_process->GetApplicationLocale();
icu::Locale loc(locale.c_str());
scoped_ptr<icu::Collator> collator(icu::Collator::createInstance(loc, error));
collator->setStrength(icu::Collator::PRIMARY);
- languages_.reserve(language_codes.size());
+ language_names->reserve(language_codes.size());
for (std::vector<std::string>::const_iterator iter = language_codes.begin();
iter != language_codes.end(); ++iter) {
std::string language_code = *iter;
string16 language_name = l10n_util::GetDisplayNameForLocale(
- language_code, g_browser_process->GetApplicationLocale(), true);
- // Insert the language in languages_ in alphabetical order.
+ language_code, locale, true);
+ // Insert the language in language_names in alphabetical order.
std::vector<LanguageNamePair>::iterator iter2;
- for (iter2 = languages_.begin(); iter2 != languages_.end(); ++iter2) {
+ for (iter2 = language_names->begin(); iter2 != language_names->end();
+ ++iter2) {
if (base::i18n::CompareString16WithCollator(collator.get(),
language_name, iter2->second) == UCOL_LESS) {
break;
}
}
- languages_.insert(iter2, LanguageNamePair(language_code, language_name));
- }
- for (std::vector<LanguageNamePair>::const_iterator iter = languages_.begin();
- iter != languages_.end(); ++iter) {
- std::string language_code = iter->first;
- if (language_code == original_language) {
- original_language_index_ = iter - languages_.begin();
- initial_original_language_index_ = original_language_index_;
- }
- if (language_code == target_language)
- target_language_index_ = iter - languages_.begin();
+ language_names->insert(iter2,
+ LanguageNamePair(language_code, language_name));
}
-
- Profile* profile =
- Profile::FromBrowserContext(web_contents->GetBrowserContext());
- prefs_.reset(new TranslatePrefs(profile->GetPrefs()));
}
-TranslateUIDelegate::~TranslateUIDelegate() {
+// static
+std::string TranslateUIDelegate::GetPageHost(
+ content::WebContents* web_contents) {
+ content::NavigationEntry* entry =
+ web_contents->GetController().GetActiveEntry();
+ return entry ? entry->GetURL().HostNoBrackets() : std::string();
}
size_t TranslateUIDelegate::GetNumberOfLanguages() const {
@@ -93,10 +98,13 @@ size_t TranslateUIDelegate::GetOriginalLanguageIndex() const {
}
void TranslateUIDelegate::UpdateOriginalLanguageIndex(size_t language_index) {
+ // Note: TranslateInfobarDelegate should be updated if this implementation is
+ // updated.
if (original_language_index_ == language_index)
return;
- UMA_HISTOGRAM_BOOLEAN(kModifyOriginalLang, true);
+ UMA_HISTOGRAM_BOOLEAN(TranslateBrowserMetrics::GetMetricsName(
+ TranslateBrowserMetrics::UMA_MODIFY_ORIGINAL_LANG), true);
original_language_index_ = language_index;
}
@@ -105,21 +113,28 @@ size_t TranslateUIDelegate::GetTargetLanguageIndex() const {
}
void TranslateUIDelegate::UpdateTargetLanguageIndex(size_t language_index) {
+ // Note: TranslateInfobarDelegate should be updated if this implementation is
+ // updated.
if (target_language_index_ == language_index)
return;
DCHECK_LT(language_index, GetNumberOfLanguages());
- UMA_HISTOGRAM_BOOLEAN(kModifyTargetLang, true);
+ UMA_HISTOGRAM_BOOLEAN(TranslateBrowserMetrics::GetMetricsName(
+ TranslateBrowserMetrics::UMA_MODIFY_TARGET_LANG), true);
target_language_index_ = language_index;
}
std::string TranslateUIDelegate::GetLanguageCodeAt(size_t index) const {
+ // Note: TranslateInfobarDelegate should be updated if this implementation is
+ // updated.
DCHECK_LT(index, GetNumberOfLanguages());
return languages_[index].first;
}
string16 TranslateUIDelegate::GetLanguageNameAt(size_t index) const {
+ // Note: TranslateInfobarDelegate should be updated if this implementation is
+ // updated.
if (index == static_cast<size_t>(NO_INDEX))
return string16();
DCHECK_LT(index, GetNumberOfLanguages());
@@ -127,16 +142,22 @@ string16 TranslateUIDelegate::GetLanguageNameAt(size_t index) const {
}
std::string TranslateUIDelegate::GetOriginalLanguageCode() const {
+ // Note: TranslateInfobarDelegate should be updated if this implementation is
+ // updated.
return (GetOriginalLanguageIndex() == static_cast<size_t>(NO_INDEX)) ?
translate::kUnknownLanguageCode :
GetLanguageCodeAt(GetOriginalLanguageIndex());
}
std::string TranslateUIDelegate::GetTargetLanguageCode() const {
+ // Note: TranslateInfobarDelegate should be updated if this implementation is
+ // updated.
return GetLanguageCodeAt(GetTargetLanguageIndex());
}
void TranslateUIDelegate::Translate() {
+ // Note: TranslateInfobarDelegate should be updated if this implementation is
+ // updated.
if (!web_contents()->GetBrowserContext()->IsOffTheRecord()) {
prefs_->ResetTranslationDeniedCount(GetOriginalLanguageCode());
prefs_->IncrementTranslationAcceptedCount(GetOriginalLanguageCode());
@@ -145,16 +166,22 @@ void TranslateUIDelegate::Translate() {
GetOriginalLanguageCode(),
GetTargetLanguageCode());
- UMA_HISTOGRAM_BOOLEAN(kPerformTranslate, true);
+ UMA_HISTOGRAM_BOOLEAN(TranslateBrowserMetrics::GetMetricsName(
+ TranslateBrowserMetrics::UMA_PERFORM_TRANSLATE), true);
}
void TranslateUIDelegate::RevertTranslation() {
+ // Note: TranslateInfobarDelegate should be updated if this implementation is
+ // updated.
TranslateManager::GetInstance()->RevertTranslation(web_contents());
- UMA_HISTOGRAM_BOOLEAN(kRevertTranslation, true);
+ UMA_HISTOGRAM_BOOLEAN(TranslateBrowserMetrics::GetMetricsName(
+ TranslateBrowserMetrics::UMA_REVERT_TRANSLATION), true);
}
void TranslateUIDelegate::TranslationDeclined() {
+ // Note: TranslateInfobarDelegate should be updated if this implementation is
+ // updated.
if (!web_contents()->GetBrowserContext()->IsOffTheRecord()) {
prefs_->ResetTranslationAcceptedCount(GetOriginalLanguageCode());
prefs_->IncrementTranslationDeniedCount(GetOriginalLanguageCode());
@@ -168,7 +195,8 @@ void TranslateUIDelegate::TranslationDeclined() {
TranslateTabHelper::FromWebContents(web_contents())->
language_state().set_translation_declined(true);
- UMA_HISTOGRAM_BOOLEAN(kDeclineTranslate, true);
+ UMA_HISTOGRAM_BOOLEAN(TranslateBrowserMetrics::GetMetricsName(
+ TranslateBrowserMetrics::UMA_DECLINE_TRANSLATE), true);
}
bool TranslateUIDelegate::IsLanguageBlocked() {
@@ -176,6 +204,8 @@ bool TranslateUIDelegate::IsLanguageBlocked() {
}
void TranslateUIDelegate::SetLanguageBlocked(bool value) {
+ // Note: TranslateInfobarDelegate should be updated if this implementation is
+ // updated.
if (value) {
prefs_->BlockLanguage(GetOriginalLanguageCode());
TranslateTabHelper* translate_tab_helper =
@@ -186,16 +216,21 @@ void TranslateUIDelegate::SetLanguageBlocked(bool value) {
prefs_->UnblockLanguage(GetOriginalLanguageCode());
}
- UMA_HISTOGRAM_BOOLEAN(kNeverTranslateLang, true);
+ UMA_HISTOGRAM_BOOLEAN(TranslateBrowserMetrics::GetMetricsName(
+ TranslateBrowserMetrics::UMA_NEVER_TRANSLATE_LANG), true);
}
bool TranslateUIDelegate::IsSiteBlacklisted() {
- std::string host = GetPageHost();
+ // Note: TranslateInfobarDelegate should be updated if this implementation is
+ // updated.
+ std::string host = GetPageHost(web_contents());
return !host.empty() && prefs_->IsSiteBlacklisted(host);
}
void TranslateUIDelegate::SetSiteBlacklist(bool value) {
- std::string host = GetPageHost();
+ // Note: TranslateInfobarDelegate should be updated if this implementation is
+ // updated.
+ std::string host = GetPageHost(web_contents());
if (host.empty())
return;
@@ -209,7 +244,8 @@ void TranslateUIDelegate::SetSiteBlacklist(bool value) {
prefs_->RemoveSiteFromBlacklist(host);
}
- UMA_HISTOGRAM_BOOLEAN(kNeverTranslateSite, true);
+ UMA_HISTOGRAM_BOOLEAN(TranslateBrowserMetrics::GetMetricsName(
+ TranslateBrowserMetrics::UMA_NEVER_TRANSLATE_SITE), true);
}
bool TranslateUIDelegate::ShouldAlwaysTranslate() {
@@ -218,6 +254,8 @@ bool TranslateUIDelegate::ShouldAlwaysTranslate() {
}
void TranslateUIDelegate::SetAlwaysTranslate(bool value) {
+ // Note: TranslateInfobarDelegate should be updated if this implementation is
+ // updated.
const std::string& original_lang = GetOriginalLanguageCode();
const std::string& target_lang = GetTargetLanguageCode();
if (value)
@@ -225,11 +263,6 @@ void TranslateUIDelegate::SetAlwaysTranslate(bool value) {
else
prefs_->RemoveLanguagePairFromWhitelist(original_lang, target_lang);
- UMA_HISTOGRAM_BOOLEAN(kAlwaysTranslateLang, true);
-}
-
-std::string TranslateUIDelegate::GetPageHost() {
- content::NavigationEntry* entry =
- web_contents()->GetController().GetActiveEntry();
- return entry ? entry->GetURL().HostNoBrackets() : std::string();
+ UMA_HISTOGRAM_BOOLEAN(TranslateBrowserMetrics::GetMetricsName(
+ TranslateBrowserMetrics::UMA_ALWAYS_TRANSLATE_LANG), true);
}

Powered by Google App Engine
This is Rietveld 408576698