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

Unified Diff: chrome/browser/ui/android/infobars/translate_infobar.cc

Issue 378253002: Fix translate namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing android build errors 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/android/infobars/translate_infobar.h ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/android/infobars/translate_infobar.cc
diff --git a/chrome/browser/ui/android/infobars/translate_infobar.cc b/chrome/browser/ui/android/infobars/translate_infobar.cc
index c2ebcc9e3117ca73be894a4f8e703720ad19b3e1..52a6ec6d589c1b39e08a464081b32f249de603b3 100644
--- a/chrome/browser/ui/android/infobars/translate_infobar.cc
+++ b/chrome/browser/ui/android/infobars/translate_infobar.cc
@@ -17,7 +17,7 @@
// ----------------------------------------------------------
scoped_ptr<infobars::InfoBar> ChromeTranslateClient::CreateInfoBar(
- scoped_ptr<TranslateInfoBarDelegate> delegate) const {
+ scoped_ptr<translate::TranslateInfoBarDelegate> delegate) const {
return scoped_ptr<infobars::InfoBar>(new TranslateInfoBar(delegate.Pass()));
}
@@ -25,7 +25,7 @@ scoped_ptr<infobars::InfoBar> ChromeTranslateClient::CreateInfoBar(
// TranslateInfoBar -----------------------------------------------------------
TranslateInfoBar::TranslateInfoBar(
- scoped_ptr<TranslateInfoBarDelegate> delegate)
+ scoped_ptr<translate::TranslateInfoBarDelegate> delegate)
: InfoBarAndroid(delegate.PassAs<infobars::InfoBarDelegate>()),
java_translate_delegate_() {
}
@@ -35,7 +35,7 @@ TranslateInfoBar::~TranslateInfoBar() {
ScopedJavaLocalRef<jobject> TranslateInfoBar::CreateRenderInfoBar(JNIEnv* env) {
java_translate_delegate_.Reset(Java_TranslateInfoBarDelegate_create(env));
- TranslateInfoBarDelegate* delegate = GetDelegate();
+ translate::TranslateInfoBarDelegate* delegate = GetDelegate();
std::vector<base::string16> languages;
languages.reserve(delegate->num_languages());
for (size_t i = 0; i < delegate->num_languages(); ++i)
@@ -56,7 +56,7 @@ void TranslateInfoBar::ProcessButton(int action,
if (!owner())
return; // We're closing; don't call anything, it might access the owner.
- TranslateInfoBarDelegate* delegate = GetDelegate();
+ translate::TranslateInfoBarDelegate* delegate = GetDelegate();
if (action == InfoBarAndroid::ACTION_TRANSLATE) {
delegate->Translate();
return;
@@ -73,7 +73,7 @@ void TranslateInfoBar::ProcessButton(int action,
}
void TranslateInfoBar::PassJavaInfoBar(InfoBarAndroid* source) {
- TranslateInfoBarDelegate* delegate = GetDelegate();
+ translate::TranslateInfoBarDelegate* delegate = GetDelegate();
DCHECK_NE(translate::TRANSLATE_STEP_BEFORE_TRANSLATE,
delegate->translate_step());
@@ -90,7 +90,7 @@ void TranslateInfoBar::ApplyTranslateOptions(JNIEnv* env,
bool always_translate,
bool never_translate_language,
bool never_translate_site) {
- TranslateInfoBarDelegate* delegate = GetDelegate();
+ translate::TranslateInfoBarDelegate* delegate = GetDelegate();
delegate->UpdateOriginalLanguageIndex(source_language_index);
delegate->UpdateTargetLanguageIndex(target_language_index);
@@ -121,13 +121,13 @@ void TranslateInfoBar::SetJavaDelegate(jobject delegate) {
}
bool TranslateInfoBar::ShouldDisplayNeverTranslateInfoBarOnCancel() {
- TranslateInfoBarDelegate* delegate = GetDelegate();
+ translate::TranslateInfoBarDelegate* delegate = GetDelegate();
return (delegate->translate_step() ==
translate::TRANSLATE_STEP_BEFORE_TRANSLATE) &&
delegate->ShouldShowNeverTranslateShortcut();
}
-TranslateInfoBarDelegate* TranslateInfoBar::GetDelegate() {
+translate::TranslateInfoBarDelegate* TranslateInfoBar::GetDelegate() {
return delegate()->AsTranslateInfoBarDelegate();
}
« no previous file with comments | « chrome/browser/ui/android/infobars/translate_infobar.h ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698