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

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

Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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
Index: chrome/browser/translate/translate_manager.cc
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc
index 0d23440b656f5734a02dee6fb9e9ae21e6d63f07..abcf065acb17d118f907b4f934df1bd8f45d08f6 100644
--- a/chrome/browser/translate/translate_manager.cc
+++ b/chrome/browser/translate/translate_manager.cc
@@ -400,7 +400,7 @@ void TranslateManager::OnURLFetchComplete(const content::URLFetcher* source) {
// The tab went away while we were retrieving the script.
continue;
}
- NavigationEntry* entry = tab->GetController().GetActiveEntry();
+ NavigationEntry* entry = tab->controller().GetActiveEntry();
if (!entry || entry->page_id() != request.page_id) {
// We navigated away from the page the translation was triggered on.
continue;
@@ -466,7 +466,7 @@ void TranslateManager::InitiateTranslation(TabContents* tab,
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableTranslate))
return;
- NavigationEntry* entry = tab->GetController().GetActiveEntry();
+ NavigationEntry* entry = tab->controller().GetActiveEntry();
if (!entry) {
// This can happen for popups created with window.open("").
return;
@@ -551,7 +551,7 @@ void TranslateManager::InitiateTranslationPosted(
void TranslateManager::TranslatePage(TabContents* tab_contents,
const std::string& source_lang,
const std::string& target_lang) {
- NavigationEntry* entry = tab_contents->GetController().GetActiveEntry();
+ NavigationEntry* entry = tab_contents->controller().GetActiveEntry();
if (!entry) {
NOTREACHED();
return;
@@ -583,7 +583,7 @@ void TranslateManager::TranslatePage(TabContents* tab_contents,
}
void TranslateManager::RevertTranslation(TabContents* tab_contents) {
- NavigationEntry* entry = tab_contents->GetController().GetActiveEntry();
+ NavigationEntry* entry = tab_contents->controller().GetActiveEntry();
if (!entry) {
NOTREACHED();
return;
@@ -599,7 +599,7 @@ void TranslateManager::RevertTranslation(TabContents* tab_contents) {
void TranslateManager::ReportLanguageDetectionError(TabContents* tab_contents) {
UMA_HISTOGRAM_COUNTS("Translate.ReportLanguageDetectionError", 1);
- GURL page_url = tab_contents->GetController().GetActiveEntry()->url();
+ GURL page_url = tab_contents->controller().GetActiveEntry()->url();
// Report option should be disabled for secure URLs.
DCHECK(!page_url.SchemeIsSecure());
std::string report_error_url(kReportLanguageDetectionErrorURL);
@@ -629,7 +629,7 @@ void TranslateManager::DoTranslatePage(TabContents* tab,
const std::string& translate_script,
const std::string& source_lang,
const std::string& target_lang) {
- NavigationEntry* entry = tab->GetController().GetActiveEntry();
+ NavigationEntry* entry = tab->controller().GetActiveEntry();
if (!entry) {
NOTREACHED();
return;
« no previous file with comments | « chrome/browser/translate/translate_infobar_delegate.cc ('k') | chrome/browser/translate/translate_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698