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

Side by Side Diff: components/translate/core/browser/translate_manager.cc

Issue 2745253005: Re-enable triggering of Translate dialog for (1) zh-CN users and zh-TW pages, and (2) zh-TW users a… (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « no previous file | components/translate/core/browser/translate_manager_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/translate/core/browser/translate_manager.h" 5 #include "components/translate/core/browser/translate_manager.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 std::unique_ptr<TranslatePrefs> translate_prefs( 217 std::unique_ptr<TranslatePrefs> translate_prefs(
218 translate_client_->GetTranslatePrefs()); 218 translate_client_->GetTranslatePrefs());
219 219
220 std::string target_lang = GetTargetLanguage(translate_prefs.get()); 220 std::string target_lang = GetTargetLanguage(translate_prefs.get());
221 std::string language_code = 221 std::string language_code =
222 TranslateDownloadManager::GetLanguageCode(page_lang); 222 TranslateDownloadManager::GetLanguageCode(page_lang);
223 223
224 InitTranslateEvent(language_code, target_lang, *translate_prefs); 224 InitTranslateEvent(language_code, target_lang, *translate_prefs);
225 225
226 // Don't translate similar languages (ex: en-US to en). 226 // Don't translate similar languages (ex: en-US to en).
227 // Also do not offer to translate between Simplified and Traditional Chinese. 227 if (language_code == target_lang) {
228 if (language_code == target_lang ||
229 (language_code == "zh-CN" && target_lang == "zh-TW") ||
230 (language_code == "zh-TW" && target_lang == "zh-CN")) {
231 TranslateBrowserMetrics::ReportInitiationStatus( 228 TranslateBrowserMetrics::ReportInitiationStatus(
232 TranslateBrowserMetrics::INITIATION_STATUS_SIMILAR_LANGUAGES); 229 TranslateBrowserMetrics::INITIATION_STATUS_SIMILAR_LANGUAGES);
233 return; 230 return;
234 } 231 }
235 // Nothing to do if either the language Chrome is in or the language of the 232 // Nothing to do if either the language Chrome is in or the language of the
236 // page is not supported by the translation server. 233 // page is not supported by the translation server.
237 if (target_lang.empty() || 234 if (target_lang.empty() ||
238 !TranslateDownloadManager::IsSupportedLanguage(language_code)) { 235 !TranslateDownloadManager::IsSupportedLanguage(language_code)) {
239 TranslateBrowserMetrics::ReportInitiationStatus( 236 TranslateBrowserMetrics::ReportInitiationStatus(
240 TranslateBrowserMetrics::INITIATION_STATUS_LANGUAGE_IS_NOT_SUPPORTED); 237 TranslateBrowserMetrics::INITIATION_STATUS_LANGUAGE_IS_NOT_SUPPORTED);
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 void TranslateManager::RecordTranslateEvent(int event_type) { 598 void TranslateManager::RecordTranslateEvent(int event_type) {
602 DCHECK(metrics::TranslateEventProto::EventType_IsValid(event_type)); 599 DCHECK(metrics::TranslateEventProto::EventType_IsValid(event_type));
603 translate_event_->set_event_type( 600 translate_event_->set_event_type(
604 static_cast<metrics::TranslateEventProto::EventType>(event_type)); 601 static_cast<metrics::TranslateEventProto::EventType>(event_type));
605 translate_event_->set_event_timestamp_sec( 602 translate_event_->set_event_timestamp_sec(
606 (base::TimeTicks::Now() - base::TimeTicks()).InSeconds()); 603 (base::TimeTicks::Now() - base::TimeTicks()).InSeconds());
607 TranslateRanker::GetInstance()->RecordTranslateEvent(*translate_event_); 604 TranslateRanker::GetInstance()->RecordTranslateEvent(*translate_event_);
608 } 605 }
609 606
610 } // namespace translate 607 } // namespace translate
OLDNEW
« no previous file with comments | « no previous file | components/translate/core/browser/translate_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698