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

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

Issue 3034013: Fetch the translate script regularly (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Synced Created 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/translate/translate_infobar_delegate.h ('k') | chrome/browser/translate/translate_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/translate/translate_infobar_delegate.cc
diff --git a/chrome/browser/translate/translate_infobar_delegate.cc b/chrome/browser/translate/translate_infobar_delegate.cc
index 22339919d0a2f2aa0f5e1b94b5a77e2f0accce7d..e1a801b37382158db11f844f2add2cebd7cb110c 100644
--- a/chrome/browser/translate/translate_infobar_delegate.cc
+++ b/chrome/browser/translate/translate_infobar_delegate.cc
@@ -23,7 +23,7 @@ TranslateInfoBarDelegate* TranslateInfoBarDelegate::CreateDelegate(
TabContents* tab_contents,
const std::string& original_language,
const std::string& target_language) {
- DCHECK(type != kTranslationError);
+ DCHECK(type != TRANSLATION_ERROR);
if (!TranslateManager::IsSupportedLanguage(original_language) ||
!TranslateManager::IsSupportedLanguage(target_language)) {
return NULL;
@@ -42,7 +42,7 @@ TranslateInfoBarDelegate* TranslateInfoBarDelegate::CreateErrorDelegate(
TabContents* tab_contents,
const std::string& original_language,
const std::string& target_language) {
- return new TranslateInfoBarDelegate(kTranslationError, error, tab_contents,
+ return new TranslateInfoBarDelegate(TRANSLATION_ERROR, error, tab_contents,
original_language, target_language);
}
@@ -54,7 +54,7 @@ TranslateInfoBarDelegate::TranslateInfoBarDelegate(
const std::string& target_language)
: InfoBarDelegate(tab_contents),
type_(type),
- background_animation_(kNone),
+ background_animation_(NONE),
tab_contents_(tab_contents),
original_language_index_(-1),
initial_original_language_index_(-1),
@@ -62,8 +62,8 @@ TranslateInfoBarDelegate::TranslateInfoBarDelegate(
error_(error),
infobar_view_(NULL),
prefs_(tab_contents_->profile()->GetPrefs()) {
- DCHECK((type_ != kTranslationError && error == TranslateErrors::NONE) ||
- (type_ == kTranslationError && error != TranslateErrors::NONE));
+ DCHECK((type_ != TRANSLATION_ERROR && error == TranslateErrors::NONE) ||
+ (type_ == TRANSLATION_ERROR && error != TranslateErrors::NONE));
std::vector<std::string> language_codes;
TranslateManager::GetSupportedLanguages(&language_codes);
@@ -123,7 +123,7 @@ void TranslateInfoBarDelegate::SetOriginalLanguage(int language_index) {
original_language_index_ = language_index;
if (infobar_view_)
infobar_view_->OriginalLanguageChanged();
- if (type_ == kAfterTranslate)
+ if (type_ == AFTER_TRANSLATE)
Translate();
}
@@ -132,12 +132,12 @@ void TranslateInfoBarDelegate::SetTargetLanguage(int language_index) {
target_language_index_ = language_index;
if (infobar_view_)
infobar_view_->TargetLanguageChanged();
- if (type_ == kAfterTranslate)
+ if (type_ == AFTER_TRANSLATE)
Translate();
}
bool TranslateInfoBarDelegate::IsError() {
- return type_ == kTranslationError;
+ return type_ == TRANSLATION_ERROR;
}
void TranslateInfoBarDelegate::Translate() {
@@ -175,7 +175,7 @@ void TranslateInfoBarDelegate::TranslationDeclined() {
}
void TranslateInfoBarDelegate::InfoBarDismissed() {
- if (type_ != kBeforeTranslate)
+ if (type_ != BEFORE_TRANSLATE)
return;
// The user closed the infobar without clicking the translate button.
@@ -259,11 +259,11 @@ void TranslateInfoBarDelegate::NeverTranslatePageLanguage() {
string16 TranslateInfoBarDelegate::GetMessageInfoBarText() {
switch (type_) {
- case kTranslating:
+ case TRANSLATING:
return l10n_util::GetStringFUTF16(
IDS_TRANSLATE_INFOBAR_TRANSLATING_TO,
GetLanguageDisplayableNameAt(target_language_index_));
- case kTranslationError:
+ case TRANSLATION_ERROR:
switch (error_) {
case TranslateErrors::NETWORK:
return l10n_util::GetStringUTF16(
@@ -295,9 +295,9 @@ string16 TranslateInfoBarDelegate::GetMessageInfoBarText() {
string16 TranslateInfoBarDelegate::GetMessageInfoBarButtonText() {
switch (type_) {
- case kTranslating:
+ case TRANSLATING:
return string16();
- case kTranslationError:
+ case TRANSLATION_ERROR:
if (error_ == TranslateErrors::IDENTICAL_LANGUAGES ||
error_ == TranslateErrors::UNKNOWN_LANGUAGE) {
// No retry button, we would fail again with the same error.
@@ -313,7 +313,7 @@ string16 TranslateInfoBarDelegate::GetMessageInfoBarButtonText() {
}
void TranslateInfoBarDelegate::MessageInfoBarButtonPressed() {
- DCHECK(type_ == kTranslationError);
+ DCHECK(type_ == TRANSLATION_ERROR);
if (error_ == TranslateErrors::UNSUPPORTED_LANGUAGE) {
RevertTranslation();
return;
@@ -324,22 +324,22 @@ void TranslateInfoBarDelegate::MessageInfoBarButtonPressed() {
}
bool TranslateInfoBarDelegate::ShouldShowNeverTranslateButton() {
- DCHECK(type_ == kBeforeTranslate);
+ DCHECK(type_ == BEFORE_TRANSLATE);
return prefs_.GetTranslationDeniedCount(GetOriginalLanguageCode()) >= 3;
}
bool TranslateInfoBarDelegate::ShouldShowAlwaysTranslateButton() {
- DCHECK(type_ == kBeforeTranslate);
+ DCHECK(type_ == BEFORE_TRANSLATE);
return prefs_.GetTranslationAcceptedCount(GetOriginalLanguageCode()) >= 3;
}
void TranslateInfoBarDelegate::UpdateBackgroundAnimation(
TranslateInfoBarDelegate* previous_infobar) {
if (!previous_infobar || previous_infobar->IsError() == IsError()) {
- background_animation_ = kNone;
+ background_animation_ = NONE;
return;
}
- background_animation_ = IsError() ? kNormalToError: kErrorToNormal;
+ background_animation_ = IsError() ? NORMAL_TO_ERROR: ERROR_TO_NORMAL;
}
std::string TranslateInfoBarDelegate::GetPageHost() {
« no previous file with comments | « chrome/browser/translate/translate_infobar_delegate.h ('k') | chrome/browser/translate/translate_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698