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

Side by Side Diff: chrome/browser/translate/translate_ui_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 unified diff | Download patch
« no previous file with comments | « chrome/browser/translate/translate_tab_helper.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/translate/translate_ui_delegate.h" 5 #include "chrome/browser/translate/translate_ui_delegate.h"
6 6
7 #include "base/i18n/string_compare.h" 7 #include "base/i18n/string_compare.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 150
151 std::string TranslateUIDelegate::GetTargetLanguageCode() const { 151 std::string TranslateUIDelegate::GetTargetLanguageCode() const {
152 return GetLanguageCodeAt(GetTargetLanguageIndex()); 152 return GetLanguageCodeAt(GetTargetLanguageIndex());
153 } 153 }
154 154
155 void TranslateUIDelegate::Translate() { 155 void TranslateUIDelegate::Translate() {
156 if (!web_contents()->GetBrowserContext()->IsOffTheRecord()) { 156 if (!web_contents()->GetBrowserContext()->IsOffTheRecord()) {
157 prefs_->ResetTranslationDeniedCount(GetOriginalLanguageCode()); 157 prefs_->ResetTranslationDeniedCount(GetOriginalLanguageCode());
158 prefs_->IncrementTranslationAcceptedCount(GetOriginalLanguageCode()); 158 prefs_->IncrementTranslationAcceptedCount(GetOriginalLanguageCode());
159 } 159 }
160 TranslateManager::GetInstance()->TranslatePage(web_contents(), 160 TranslateManager* manager =
161 GetOriginalLanguageCode(), 161 TranslateTabHelper::GetManagerFromWebContents(web_contents());
162 GetTargetLanguageCode()); 162 DCHECK(manager);
163 manager->TranslatePage(GetOriginalLanguageCode(), GetTargetLanguageCode());
163 164
164 UMA_HISTOGRAM_BOOLEAN(kPerformTranslate, true); 165 UMA_HISTOGRAM_BOOLEAN(kPerformTranslate, true);
165 } 166 }
166 167
167 void TranslateUIDelegate::RevertTranslation() { 168 void TranslateUIDelegate::RevertTranslation() {
168 TranslateManager::GetInstance()->RevertTranslation(web_contents()); 169 TranslateManager* manager =
170 TranslateTabHelper::GetManagerFromWebContents(web_contents());
171 DCHECK(manager);
172 manager->RevertTranslation();
169 173
170 UMA_HISTOGRAM_BOOLEAN(kRevertTranslation, true); 174 UMA_HISTOGRAM_BOOLEAN(kRevertTranslation, true);
171 } 175 }
172 176
173 void TranslateUIDelegate::TranslationDeclined(bool explicitly_closed) { 177 void TranslateUIDelegate::TranslationDeclined(bool explicitly_closed) {
174 if (!web_contents()->GetBrowserContext()->IsOffTheRecord()) { 178 if (!web_contents()->GetBrowserContext()->IsOffTheRecord()) {
175 prefs_->ResetTranslationAcceptedCount(GetOriginalLanguageCode()); 179 prefs_->ResetTranslationAcceptedCount(GetOriginalLanguageCode());
176 prefs_->IncrementTranslationDeniedCount(GetOriginalLanguageCode()); 180 prefs_->IncrementTranslationDeniedCount(GetOriginalLanguageCode());
177 } 181 }
178 182
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 prefs_->RemoveLanguagePairFromWhitelist(original_lang, target_lang); 249 prefs_->RemoveLanguagePairFromWhitelist(original_lang, target_lang);
246 250
247 UMA_HISTOGRAM_BOOLEAN(kAlwaysTranslateLang, true); 251 UMA_HISTOGRAM_BOOLEAN(kAlwaysTranslateLang, true);
248 } 252 }
249 253
250 std::string TranslateUIDelegate::GetPageHost() { 254 std::string TranslateUIDelegate::GetPageHost() {
251 content::NavigationEntry* entry = 255 content::NavigationEntry* entry =
252 web_contents()->GetController().GetActiveEntry(); 256 web_contents()->GetController().GetActiveEntry();
253 return entry ? entry->GetURL().HostNoBrackets() : std::string(); 257 return entry ? entry->GetURL().HostNoBrackets() : std::string();
254 } 258 }
OLDNEW
« no previous file with comments | « chrome/browser/translate/translate_tab_helper.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698