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

Unified Diff: chrome/browser/ui/browser.cc

Issue 564743002: Move Translate browser-side IPC handling to the component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix comments Created 6 years, 3 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
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 95b39dd89bff2fcb8ccd82de6793ca296a74289b..49df781f5badeca60fc1bac0611d4afdc53ab730 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -2243,14 +2243,15 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
CoreTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
SearchEngineTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
SearchTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
- if (delegate)
+ translate::ContentTranslateDriver& content_translate_driver =
+ ChromeTranslateClient::FromWebContents(web_contents)->translate_driver();
+ if (delegate) {
ZoomController::FromWebContents(web_contents)->AddObserver(this);
- else
+ content_translate_driver.AddObserver(translate_driver_observer_.get());
+ } else {
ZoomController::FromWebContents(web_contents)->RemoveObserver(this);
- ChromeTranslateClient* chrome_translate_client =
- ChromeTranslateClient::FromWebContents(web_contents);
- chrome_translate_client->translate_driver().set_observer(
- delegate ? delegate->translate_driver_observer_.get() : NULL);
+ content_translate_driver.RemoveObserver(translate_driver_observer_.get());
+ }
}
void Browser::CloseFrame() {
« no previous file with comments | « chrome/browser/translate/chrome_translate_client.cc ('k') | components/translate/content/browser/content_translate_driver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698