| OLD | NEW |
| 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 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 2331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2342 Browser* delegate = set_delegate ? this : NULL; | 2342 Browser* delegate = set_delegate ? this : NULL; |
| 2343 // WebContents... | 2343 // WebContents... |
| 2344 web_contents->SetDelegate(delegate); | 2344 web_contents->SetDelegate(delegate); |
| 2345 | 2345 |
| 2346 // ...and all the helpers. | 2346 // ...and all the helpers. |
| 2347 BookmarkTabHelper::FromWebContents(web_contents)->set_delegate(delegate); | 2347 BookmarkTabHelper::FromWebContents(web_contents)->set_delegate(delegate); |
| 2348 WebContentsModalDialogManager::FromWebContents(web_contents)-> | 2348 WebContentsModalDialogManager::FromWebContents(web_contents)-> |
| 2349 SetDelegate(delegate); | 2349 SetDelegate(delegate); |
| 2350 CoreTabHelper::FromWebContents(web_contents)->set_delegate(delegate); | 2350 CoreTabHelper::FromWebContents(web_contents)->set_delegate(delegate); |
| 2351 SearchTabHelper::FromWebContents(web_contents)->set_delegate(delegate); | 2351 SearchTabHelper::FromWebContents(web_contents)->set_delegate(delegate); |
| 2352 translate::ContentTranslateDriver& content_translate_driver = | 2352 translate::ContentTranslateDriverImpl& content_translate_driver = |
| 2353 ChromeTranslateClient::FromWebContents(web_contents)->translate_driver(); | 2353 ChromeTranslateClient::FromWebContents(web_contents)->translate_driver(); |
| 2354 if (delegate) { | 2354 if (delegate) { |
| 2355 zoom::ZoomController::FromWebContents(web_contents)->AddObserver(this); | 2355 zoom::ZoomController::FromWebContents(web_contents)->AddObserver(this); |
| 2356 content_translate_driver.AddObserver(this); | 2356 content_translate_driver.AddObserver(this); |
| 2357 } else { | 2357 } else { |
| 2358 zoom::ZoomController::FromWebContents(web_contents)->RemoveObserver(this); | 2358 zoom::ZoomController::FromWebContents(web_contents)->RemoveObserver(this); |
| 2359 content_translate_driver.RemoveObserver(this); | 2359 content_translate_driver.RemoveObserver(this); |
| 2360 } | 2360 } |
| 2361 } | 2361 } |
| 2362 | 2362 |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2602 if (contents && !allow_js_access) { | 2602 if (contents && !allow_js_access) { |
| 2603 contents->web_contents()->GetController().LoadURL( | 2603 contents->web_contents()->GetController().LoadURL( |
| 2604 target_url, | 2604 target_url, |
| 2605 content::Referrer(), | 2605 content::Referrer(), |
| 2606 ui::PAGE_TRANSITION_LINK, | 2606 ui::PAGE_TRANSITION_LINK, |
| 2607 std::string()); // No extra headers. | 2607 std::string()); // No extra headers. |
| 2608 } | 2608 } |
| 2609 | 2609 |
| 2610 return contents != NULL; | 2610 return contents != NULL; |
| 2611 } | 2611 } |
| OLD | NEW |