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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // defined(OS_WIN) 10 #endif // defined(OS_WIN)
(...skipping 2225 matching lines...) Expand 10 before | Expand all | Expand 10 after
2236 // WebContents... 2236 // WebContents...
2237 web_contents->SetDelegate(delegate); 2237 web_contents->SetDelegate(delegate);
2238 2238
2239 // ...and all the helpers. 2239 // ...and all the helpers.
2240 BookmarkTabHelper::FromWebContents(web_contents)->set_delegate(delegate); 2240 BookmarkTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
2241 WebContentsModalDialogManager::FromWebContents(web_contents)-> 2241 WebContentsModalDialogManager::FromWebContents(web_contents)->
2242 SetDelegate(delegate); 2242 SetDelegate(delegate);
2243 CoreTabHelper::FromWebContents(web_contents)->set_delegate(delegate); 2243 CoreTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
2244 SearchEngineTabHelper::FromWebContents(web_contents)->set_delegate(delegate); 2244 SearchEngineTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
2245 SearchTabHelper::FromWebContents(web_contents)->set_delegate(delegate); 2245 SearchTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
2246 if (delegate) 2246 translate::ContentTranslateDriver& content_translate_driver =
2247 ChromeTranslateClient::FromWebContents(web_contents)->translate_driver();
2248 if (delegate) {
2247 ZoomController::FromWebContents(web_contents)->AddObserver(this); 2249 ZoomController::FromWebContents(web_contents)->AddObserver(this);
2248 else 2250 content_translate_driver.AddObserver(translate_driver_observer_.get());
2251 } else {
2249 ZoomController::FromWebContents(web_contents)->RemoveObserver(this); 2252 ZoomController::FromWebContents(web_contents)->RemoveObserver(this);
2250 ChromeTranslateClient* chrome_translate_client = 2253 content_translate_driver.RemoveObserver(translate_driver_observer_.get());
2251 ChromeTranslateClient::FromWebContents(web_contents); 2254 }
2252 chrome_translate_client->translate_driver().set_observer(
2253 delegate ? delegate->translate_driver_observer_.get() : NULL);
2254 } 2255 }
2255 2256
2256 void Browser::CloseFrame() { 2257 void Browser::CloseFrame() {
2257 window_->Close(); 2258 window_->Close();
2258 } 2259 }
2259 2260
2260 void Browser::TabDetachedAtImpl(content::WebContents* contents, 2261 void Browser::TabDetachedAtImpl(content::WebContents* contents,
2261 int index, 2262 int index,
2262 DetachType type) { 2263 DetachType type) {
2263 if (type == DETACH_TYPE_DETACH) { 2264 if (type == DETACH_TYPE_DETACH) {
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
2472 if (contents && !allow_js_access) { 2473 if (contents && !allow_js_access) {
2473 contents->web_contents()->GetController().LoadURL( 2474 contents->web_contents()->GetController().LoadURL(
2474 target_url, 2475 target_url,
2475 content::Referrer(), 2476 content::Referrer(),
2476 content::PAGE_TRANSITION_LINK, 2477 content::PAGE_TRANSITION_LINK,
2477 std::string()); // No extra headers. 2478 std::string()); // No extra headers.
2478 } 2479 }
2479 2480
2480 return contents != NULL; 2481 return contents != NULL;
2481 } 2482 }
OLDNEW
« 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