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

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

Issue 25373009: Translate: New Bubble UX (for the view toolkit) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bug fix: view id on tests Created 7 years, 2 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
« no previous file with comments | « chrome/browser/translate/translate_tab_helper.cc ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f28941d4ddd623717576eef779bdfd49284cd63b..ef711783daad861a43c8accf26c0524348b3bb39 100644
--- a/chrome/browser/translate/translate_ui_delegate.cc
+++ b/chrome/browser/translate/translate_ui_delegate.cc
@@ -91,7 +91,6 @@ size_t TranslateUIDelegate::GetOriginalLanguageIndex() const {
}
void TranslateUIDelegate::SetOriginalLanguageIndex(size_t language_index) {
- DCHECK_LT(language_index, GetNumberOfLanguages());
original_language_index_ = language_index;
}
@@ -167,10 +166,15 @@ bool TranslateUIDelegate::IsLanguageBlocked() {
}
void TranslateUIDelegate::SetLanguageBlocked(bool value) {
- if (value)
+ if (value) {
prefs_->BlockLanguage(GetOriginalLanguageCode());
- else
+ TranslateTabHelper* translate_tab_helper =
+ TranslateTabHelper::FromWebContents(web_contents());
+ DCHECK(translate_tab_helper);
+ translate_tab_helper->language_state().SetTranslateEnabled(false);
+ } else {
prefs_->UnblockLanguage(GetOriginalLanguageCode());
+ }
UMA_HISTOGRAM_BOOLEAN(kNeverTranslateLang, true);
}
@@ -185,10 +189,15 @@ void TranslateUIDelegate::SetSiteBlacklist(bool value) {
if (host.empty())
return;
- if (value)
+ if (value) {
prefs_->BlacklistSite(host);
- else
+ TranslateTabHelper* translate_tab_helper =
+ TranslateTabHelper::FromWebContents(web_contents());
+ DCHECK(translate_tab_helper);
+ translate_tab_helper->language_state().SetTranslateEnabled(false);
+ } else {
prefs_->RemoveSiteFromBlacklist(host);
+ }
UMA_HISTOGRAM_BOOLEAN(kNeverTranslateSite, true);
}
« no previous file with comments | « chrome/browser/translate/translate_tab_helper.cc ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698