| 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..4e40115a119ff9fd20dc2c04ed5e92c36bda032c 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) {
|
| + languages_ =
|
| + GetSortedLanguageNames(g_browser_process->GetApplicationLocale());
|
| +
|
| + 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
|
| +std::vector<TranslateUIDelegate::LanguageNamePair>
|
| + TranslateUIDelegate::GetSortedLanguageNames(const std::string& locale) {
|
| 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());
|
| + std::vector<LanguageNamePair> language_names;
|
| + 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()));
|
| + return language_names;
|
| }
|
|
|
| -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 {
|
| @@ -96,7 +101,8 @@ void TranslateUIDelegate::UpdateOriginalLanguageIndex(size_t language_index) {
|
| 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;
|
| }
|
|
|
| @@ -109,7 +115,8 @@ void TranslateUIDelegate::UpdateTargetLanguageIndex(size_t 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;
|
| }
|
|
|
| @@ -145,13 +152,15 @@ void TranslateUIDelegate::Translate() {
|
| GetOriginalLanguageCode(),
|
| GetTargetLanguageCode());
|
|
|
| - UMA_HISTOGRAM_BOOLEAN(kPerformTranslate, true);
|
| + UMA_HISTOGRAM_BOOLEAN(TranslateBrowserMetrics::GetMetricsName(
|
| + TranslateBrowserMetrics::UMA_PERFORM_TRANSLATE), true);
|
| }
|
|
|
| void TranslateUIDelegate::RevertTranslation() {
|
| TranslateManager::GetInstance()->RevertTranslation(web_contents());
|
|
|
| - UMA_HISTOGRAM_BOOLEAN(kRevertTranslation, true);
|
| + UMA_HISTOGRAM_BOOLEAN(TranslateBrowserMetrics::GetMetricsName(
|
| + TranslateBrowserMetrics::UMA_REVERT_TRANSLATION), true);
|
| }
|
|
|
| void TranslateUIDelegate::TranslationDeclined() {
|
| @@ -168,7 +177,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() {
|
| @@ -186,16 +196,17 @@ 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();
|
| + std::string host = GetPageHost(web_contents());
|
| return !host.empty() && prefs_->IsSiteBlacklisted(host);
|
| }
|
|
|
| void TranslateUIDelegate::SetSiteBlacklist(bool value) {
|
| - std::string host = GetPageHost();
|
| + std::string host = GetPageHost(web_contents());
|
| if (host.empty())
|
| return;
|
|
|
| @@ -209,7 +220,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() {
|
| @@ -225,11 +237,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);
|
| }
|
|
|