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

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

Issue 87503004: Pass the Translate error type to the bubble (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: (rebasing) 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_manager.cc
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc
index b507e38ca72860a392b4d4733492113dc4bad089..515ddf3596b11360369f0507b66c359d9e0c68a6 100644
--- a/chrome/browser/translate/translate_manager.cc
+++ b/chrome/browser/translate/translate_manager.cc
@@ -433,7 +433,8 @@ void TranslateManager::InitiateTranslation(WebContents* web_contents,
language_state.SetTranslateEnabled(true);
if (language_state.HasLanguageChanged()) {
ShowBubble(web_contents,
- TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE);
+ TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE,
+ TranslateErrors::NONE);
}
} else {
// Prompts the user if he/she wants the page translated.
@@ -494,7 +495,8 @@ void TranslateManager::TranslatePage(WebContents* web_contents,
source_lang = std::string(translate::kUnknownLanguageCode);
if (IsEnabledTranslateNewUX()) {
- ShowBubble(web_contents, TranslateBubbleModel::VIEW_STATE_TRANSLATING);
+ ShowBubble(web_contents, TranslateBubbleModel::VIEW_STATE_TRANSLATING,
+ TranslateErrors::NONE);
} else {
Profile* profile =
Profile::FromBrowserContext(web_contents->GetBrowserContext());
@@ -619,7 +621,7 @@ void TranslateManager::PageTranslated(WebContents* web_contents,
(details->error_type == TranslateErrors::NONE) ?
TranslateBubbleModel::VIEW_STATE_AFTER_TRANSLATE :
TranslateBubbleModel::VIEW_STATE_ERROR;
- ShowBubble(web_contents, view_state);
+ ShowBubble(web_contents, view_state, details->error_type);
} else {
PrefService* prefs = Profile::FromBrowserContext(
web_contents->GetBrowserContext())->GetPrefs();
@@ -689,7 +691,8 @@ void TranslateManager::OnTranslateScriptFetchComplete(
request.source_lang, request.target_lang);
} else {
if (IsEnabledTranslateNewUX()) {
- ShowBubble(web_contents, TranslateBubbleModel::VIEW_STATE_ERROR);
+ ShowBubble(web_contents, TranslateBubbleModel::VIEW_STATE_ERROR,
+ TranslateErrors::NETWORK);
} else {
Profile* profile =
Profile::FromBrowserContext(web_contents->GetBrowserContext());
@@ -713,7 +716,8 @@ void TranslateManager::OnTranslateScriptFetchComplete(
}
void TranslateManager::ShowBubble(WebContents* web_contents,
- TranslateBubbleModel::ViewState view_state) {
+ TranslateBubbleModel::ViewState view_state,
+ TranslateErrors::Type error_type) {
// The bubble is implemented only on the desktop platforms.
#if !defined(OS_ANDROID) && !defined(OS_IOS)
Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
@@ -721,7 +725,7 @@ void TranslateManager::ShowBubble(WebContents* web_contents,
// |browser| might be NULL when testing. In this case, Show(...) should be
// called because the implementation for testing is used.
if (!browser) {
- TranslateBubbleFactory::Show(NULL, web_contents, view_state);
+ TranslateBubbleFactory::Show(NULL, web_contents, view_state, error_type);
return;
}
@@ -732,7 +736,7 @@ void TranslateManager::ShowBubble(WebContents* web_contents,
if (window && !window->IsActive())
return;
- TranslateBubbleFactory::Show(window, web_contents, view_state);
+ TranslateBubbleFactory::Show(window, web_contents, view_state, error_type);
#else
NOTREACHED();
#endif

Powered by Google App Engine
This is Rietveld 408576698