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

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

Issue 371113002: Fixes for re-enabling more MSVC level 4 warnings: components/ edition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Attempt to fix compile failure Created 6 years, 5 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 | Annotate | Revision Log
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_ui_delegate.h" 5 #include "components/translate/core/browser/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 "components/translate/core/browser/language_state.h" 9 #include "components/translate/core/browser/language_state.h"
10 #include "components/translate/core/browser/translate_client.h" 10 #include "components/translate/core/browser/translate_client.h"
(...skipping 20 matching lines...) Expand all
31 31
32 } // namespace 32 } // namespace
33 33
34 TranslateUIDelegate::TranslateUIDelegate( 34 TranslateUIDelegate::TranslateUIDelegate(
35 const base::WeakPtr<TranslateManager>& translate_manager, 35 const base::WeakPtr<TranslateManager>& translate_manager,
36 const std::string& original_language, 36 const std::string& original_language,
37 const std::string& target_language) 37 const std::string& target_language)
38 : translate_driver_( 38 : translate_driver_(
39 translate_manager->translate_client()->GetTranslateDriver()), 39 translate_manager->translate_client()->GetTranslateDriver()),
40 translate_manager_(translate_manager), 40 translate_manager_(translate_manager),
41 original_language_index_(NO_INDEX), 41 original_language_index_(kNoIndex),
42 initial_original_language_index_(NO_INDEX), 42 initial_original_language_index_(kNoIndex),
43 target_language_index_(NO_INDEX) { 43 target_language_index_(kNoIndex) {
44 DCHECK(translate_driver_); 44 DCHECK(translate_driver_);
45 DCHECK(translate_manager_); 45 DCHECK(translate_manager_);
46 46
47 std::vector<std::string> language_codes; 47 std::vector<std::string> language_codes;
48 TranslateDownloadManager::GetSupportedLanguages(&language_codes); 48 TranslateDownloadManager::GetSupportedLanguages(&language_codes);
49 49
50 // Preparing for the alphabetical order in the locale. 50 // Preparing for the alphabetical order in the locale.
51 UErrorCode error = U_ZERO_ERROR; 51 UErrorCode error = U_ZERO_ERROR;
52 std::string locale = 52 std::string locale =
53 TranslateDownloadManager::GetInstance()->application_locale(); 53 TranslateDownloadManager::GetInstance()->application_locale();
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 UMA_HISTOGRAM_BOOLEAN(kModifyTargetLang, true); 133 UMA_HISTOGRAM_BOOLEAN(kModifyTargetLang, true);
134 target_language_index_ = language_index; 134 target_language_index_ = language_index;
135 } 135 }
136 136
137 std::string TranslateUIDelegate::GetLanguageCodeAt(size_t index) const { 137 std::string TranslateUIDelegate::GetLanguageCodeAt(size_t index) const {
138 DCHECK_LT(index, GetNumberOfLanguages()); 138 DCHECK_LT(index, GetNumberOfLanguages());
139 return languages_[index].first; 139 return languages_[index].first;
140 } 140 }
141 141
142 base::string16 TranslateUIDelegate::GetLanguageNameAt(size_t index) const { 142 base::string16 TranslateUIDelegate::GetLanguageNameAt(size_t index) const {
143 if (index == static_cast<size_t>(NO_INDEX)) 143 if (index == kNoIndex)
144 return base::string16(); 144 return base::string16();
145 DCHECK_LT(index, GetNumberOfLanguages()); 145 DCHECK_LT(index, GetNumberOfLanguages());
146 return languages_[index].second; 146 return languages_[index].second;
147 } 147 }
148 148
149 std::string TranslateUIDelegate::GetOriginalLanguageCode() const { 149 std::string TranslateUIDelegate::GetOriginalLanguageCode() const {
150 return (GetOriginalLanguageIndex() == static_cast<size_t>(NO_INDEX)) 150 return (GetOriginalLanguageIndex() == kNoIndex) ?
151 ? translate::kUnknownLanguageCode 151 translate::kUnknownLanguageCode :
152 : GetLanguageCodeAt(GetOriginalLanguageIndex()); 152 GetLanguageCodeAt(GetOriginalLanguageIndex());
153 } 153 }
154 154
155 std::string TranslateUIDelegate::GetTargetLanguageCode() const { 155 std::string TranslateUIDelegate::GetTargetLanguageCode() const {
156 return GetLanguageCodeAt(GetTargetLanguageIndex()); 156 return GetLanguageCodeAt(GetTargetLanguageIndex());
157 } 157 }
158 158
159 void TranslateUIDelegate::Translate() { 159 void TranslateUIDelegate::Translate() {
160 if (!translate_driver_->IsOffTheRecord()) { 160 if (!translate_driver_->IsOffTheRecord()) {
161 prefs_->ResetTranslationDeniedCount(GetOriginalLanguageCode()); 161 prefs_->ResetTranslationDeniedCount(GetOriginalLanguageCode());
162 prefs_->IncrementTranslationAcceptedCount(GetOriginalLanguageCode()); 162 prefs_->IncrementTranslationAcceptedCount(GetOriginalLanguageCode());
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 prefs_->RemoveLanguagePairFromWhitelist(original_lang, target_lang); 250 prefs_->RemoveLanguagePairFromWhitelist(original_lang, target_lang);
251 251
252 UMA_HISTOGRAM_BOOLEAN(kAlwaysTranslateLang, true); 252 UMA_HISTOGRAM_BOOLEAN(kAlwaysTranslateLang, true);
253 } 253 }
254 254
255 std::string TranslateUIDelegate::GetPageHost() { 255 std::string TranslateUIDelegate::GetPageHost() {
256 if (!translate_driver_->HasCurrentPage()) 256 if (!translate_driver_->HasCurrentPage())
257 return std::string(); 257 return std::string();
258 return translate_driver_->GetActiveURL().HostNoBrackets(); 258 return translate_driver_->GetActiveURL().HostNoBrackets();
259 } 259 }
OLDNEW
« no previous file with comments | « components/translate/core/browser/translate_ui_delegate.h ('k') | components/url_matcher/substring_set_matcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698