Commit 088a00a8 authored by Michael Martis's avatar Michael Martis Committed by Commit Bot

Helped disambiguate a misleading method name.

Bug: None
Change-Id: I765d5e3134721bd801a4dc673216e45ac938d448
Reviewed-on: https://chromium-review.googlesource.com/1009268Reviewed-by: default avatarJia Meng <jiameng@chromium.org>
Commit-Queue: Michael Martis <martis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550120}
parent c6c91a29
...@@ -132,7 +132,7 @@ void TranslateHelper::PageCaptured(const base::string16& contents) { ...@@ -132,7 +132,7 @@ void TranslateHelper::PageCaptured(const base::string16& contents) {
ResetPage(); ResetPage();
mojom::PagePtr page; mojom::PagePtr page;
binding_.Bind(mojo::MakeRequest(&page)); binding_.Bind(mojo::MakeRequest(&page));
GetTranslateDriver()->RegisterPage( GetTranslateHandler()->RegisterPage(
std::move(page), details, !details.has_notranslate && !language.empty()); std::move(page), details, !details.has_notranslate && !language.empty());
} }
...@@ -441,13 +441,13 @@ void TranslateHelper::NotifyBrowserTranslationFailed( ...@@ -441,13 +441,13 @@ void TranslateHelper::NotifyBrowserTranslationFailed(
.Run(false, source_lang_, target_lang_, error); .Run(false, source_lang_, target_lang_, error);
} }
const mojom::ContentTranslateDriverPtr& TranslateHelper::GetTranslateDriver() { const mojom::ContentTranslateDriverPtr& TranslateHelper::GetTranslateHandler() {
if (!translate_driver_) { if (!translate_handler_) {
render_frame()->GetRemoteInterfaces()->GetInterface( render_frame()->GetRemoteInterfaces()->GetInterface(
mojo::MakeRequest(&translate_driver_)); mojo::MakeRequest(&translate_handler_));
} }
return translate_driver_; return translate_handler_;
} }
void TranslateHelper::ResetPage() { void TranslateHelper::ResetPage() {
......
...@@ -118,7 +118,7 @@ class TranslateHelper : public content::RenderFrameObserver, ...@@ -118,7 +118,7 @@ class TranslateHelper : public content::RenderFrameObserver,
static std::string BuildTranslationScript(const std::string& source_lang, static std::string BuildTranslationScript(const std::string& source_lang,
const std::string& target_lang); const std::string& target_lang);
const mojom::ContentTranslateDriverPtr& GetTranslateDriver(); const mojom::ContentTranslateDriverPtr& GetTranslateHandler();
// Cleanups all states and pending callbacks associated with the current // Cleanups all states and pending callbacks associated with the current
// running page translation. // running page translation.
...@@ -163,7 +163,11 @@ class TranslateHelper : public content::RenderFrameObserver, ...@@ -163,7 +163,11 @@ class TranslateHelper : public content::RenderFrameObserver,
// The URL scheme for translate extensions. // The URL scheme for translate extensions.
std::string extension_scheme_; std::string extension_scheme_;
mojom::ContentTranslateDriverPtr translate_driver_; // The Mojo pipe for communication with the browser process. Due to a
// refactor, the other end of the pipe is now attached to a
// LanguageDetectionTabHelper (which implements the ContentTranslateDriver
// Mojo interface).
mojom::ContentTranslateDriverPtr translate_handler_;
mojo::Binding<mojom::Page> binding_; mojo::Binding<mojom::Page> binding_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment