summaryrefslogtreecommitdiffstats
path: root/chrome/browser/translate/languages_menu_model.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/translate/languages_menu_model.cc')
-rw-r--r--chrome/browser/translate/languages_menu_model.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/browser/translate/languages_menu_model.cc b/chrome/browser/translate/languages_menu_model.cc
index bd3ec10..8e5eb436 100644
--- a/chrome/browser/translate/languages_menu_model.cc
+++ b/chrome/browser/translate/languages_menu_model.cc
@@ -13,22 +13,23 @@ LanguagesMenuModel::LanguagesMenuModel(
: ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
translate_infobar_delegate_(translate_delegate),
language_type_(language_type) {
- for (int i = 0; i < translate_delegate->GetLanguageCount(); ++i)
- AddCheckItem(i, translate_delegate->GetLanguageDisplayableNameAt(i));
+ for (size_t i = 0; i < translate_delegate->GetLanguageCount(); ++i)
+ AddCheckItem(static_cast<int>(i),
+ translate_delegate->GetLanguageDisplayableNameAt(i));
}
LanguagesMenuModel::~LanguagesMenuModel() {
}
bool LanguagesMenuModel::IsCommandIdChecked(int command_id) const {
- return command_id == ((language_type_ == ORIGINAL) ?
+ return static_cast<size_t>(command_id) == ((language_type_ == ORIGINAL) ?
translate_infobar_delegate_->original_language_index() :
translate_infobar_delegate_->target_language_index());
}
bool LanguagesMenuModel::IsCommandIdEnabled(int command_id) const {
// Prevent the same language from being selectable in original and target.
- return command_id != ((language_type_ == ORIGINAL) ?
+ return static_cast<size_t>(command_id) != ((language_type_ == ORIGINAL) ?
translate_infobar_delegate_->target_language_index() :
translate_infobar_delegate_->original_language_index());
}
@@ -40,11 +41,12 @@ bool LanguagesMenuModel::GetAcceleratorForCommandId(
}
void LanguagesMenuModel::ExecuteCommand(int command_id) {
+ size_t command_id_size_t = static_cast<size_t>(command_id);
if (language_type_ == ORIGINAL) {
UMA_HISTOGRAM_COUNTS("Translate.ModifyOriginalLang", 1);
- translate_infobar_delegate_->SetOriginalLanguage(command_id);
+ translate_infobar_delegate_->SetOriginalLanguage(command_id_size_t);
return;
}
UMA_HISTOGRAM_COUNTS("Translate.ModifyTargetLang", 1);
- translate_infobar_delegate_->SetTargetLanguage(command_id);
+ translate_infobar_delegate_->SetTargetLanguage(command_id_size_t);
}