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

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

Issue 166963002: TranslateManager is no longer a singleton (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@temp
Patch Set: Fix TODO comment Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/translate/translate_infobar_delegate.cc
diff --git a/chrome/browser/translate/translate_infobar_delegate.cc b/chrome/browser/translate/translate_infobar_delegate.cc
index a2b8254571155f4e1148f26040180b65239e1b78..3161152dbb44c00ea7d54e5f5d4771fff06684ec 100644
--- a/chrome/browser/translate/translate_infobar_delegate.cc
+++ b/chrome/browser/translate/translate_infobar_delegate.cc
@@ -131,8 +131,11 @@ void TranslateInfoBarDelegate::RevertTranslation() {
}
void TranslateInfoBarDelegate::ReportLanguageDetectionError() {
- TranslateManager::GetInstance()->ReportLanguageDetectionError(
- web_contents());
+ TranslateManager* manager =
+ TranslateTabHelper::GetManagerFromWebContents(web_contents());
+ if (!manager)
+ return;
+ manager->ReportLanguageDetectionError();
}
void TranslateInfoBarDelegate::TranslationDeclined() {
@@ -250,8 +253,10 @@ void TranslateInfoBarDelegate::MessageInfoBarButtonPressed() {
return;
}
// This is the "Try again..." case.
- TranslateManager::GetInstance()->TranslatePage(
- web_contents(), original_language_code(), target_language_code());
+ TranslateManager* manager =
+ TranslateTabHelper::GetManagerFromWebContents(web_contents());
+ DCHECK(manager);
+ manager->TranslatePage(original_language_code(), target_language_code());
}
bool TranslateInfoBarDelegate::ShouldShowMessageInfoBarButton() {
« no previous file with comments | « chrome/browser/tab_contents/render_view_context_menu.cc ('k') | chrome/browser/translate/translate_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698