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

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

Issue 2900603003: Successful translation erroneously reported on page with too little text (Closed)
Patch Set: Fixed a nit Created 3 years, 6 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 | « components/translate/core/browser/language_state.cc ('k') | no next file » | 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 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 TranslateErrorDetails error_details; 420 TranslateErrorDetails error_details;
421 error_details.time = base::Time::Now(); 421 error_details.time = base::Time::Now();
422 error_details.url = translate_driver_->GetLastCommittedURL(); 422 error_details.url = translate_driver_->GetLastCommittedURL();
423 error_details.error = error_type; 423 error_details.error = error_type;
424 g_callback_list_->Notify(error_details); 424 g_callback_list_->Notify(error_details);
425 } 425 }
426 426
427 void TranslateManager::PageTranslated(const std::string& source_lang, 427 void TranslateManager::PageTranslated(const std::string& source_lang,
428 const std::string& target_lang, 428 const std::string& target_lang,
429 TranslateErrors::Type error_type) { 429 TranslateErrors::Type error_type) {
430 language_state_.SetCurrentLanguage(target_lang); 430 if (error_type == TranslateErrors::NONE)
431 language_state_.SetCurrentLanguage(target_lang);
432
431 language_state_.set_translation_pending(false); 433 language_state_.set_translation_pending(false);
434 language_state_.set_translation_error(error_type != TranslateErrors::NONE);
432 435
433 if ((error_type == TranslateErrors::NONE) && 436 if ((error_type == TranslateErrors::NONE) &&
434 source_lang != translate::kUnknownLanguageCode && 437 source_lang != translate::kUnknownLanguageCode &&
435 !TranslateDownloadManager::IsSupportedLanguage(source_lang)) { 438 !TranslateDownloadManager::IsSupportedLanguage(source_lang)) {
436 error_type = TranslateErrors::UNSUPPORTED_LANGUAGE; 439 error_type = TranslateErrors::UNSUPPORTED_LANGUAGE;
437 } 440 }
438 441
439 translate_client_->ShowTranslateUI(translate::TRANSLATE_STEP_AFTER_TRANSLATE, 442 translate_client_->ShowTranslateUI(translate::TRANSLATE_STEP_AFTER_TRANSLATE,
440 source_lang, target_lang, error_type, 443 source_lang, target_lang, error_type,
441 false); 444 false);
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 source_language) && 604 source_language) &&
602 !ShouldOverrideDecision( 605 !ShouldOverrideDecision(
603 metrics::TranslateEventProto::LANGUAGE_DISABLED_BY_AUTO_BLACKLIST)) { 606 metrics::TranslateEventProto::LANGUAGE_DISABLED_BY_AUTO_BLACKLIST)) {
604 return true; 607 return true;
605 } 608 }
606 609
607 return false; 610 return false;
608 } 611 }
609 612
610 } // namespace translate 613 } // namespace translate
OLDNEW
« no previous file with comments | « components/translate/core/browser/language_state.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698