| 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 #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 2078 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2089 | 2089 |
| 2090 // ...and all the helpers. | 2090 // ...and all the helpers. |
| 2091 BookmarkTabHelper::FromWebContents(web_contents)->set_delegate(delegate); | 2091 BookmarkTabHelper::FromWebContents(web_contents)->set_delegate(delegate); |
| 2092 WebContentsModalDialogManager::FromWebContents(web_contents)-> | 2092 WebContentsModalDialogManager::FromWebContents(web_contents)-> |
| 2093 SetDelegate(delegate); | 2093 SetDelegate(delegate); |
| 2094 CoreTabHelper::FromWebContents(web_contents)->set_delegate(delegate); | 2094 CoreTabHelper::FromWebContents(web_contents)->set_delegate(delegate); |
| 2095 SearchEngineTabHelper::FromWebContents(web_contents)->set_delegate(delegate); | 2095 SearchEngineTabHelper::FromWebContents(web_contents)->set_delegate(delegate); |
| 2096 ZoomController::FromWebContents(web_contents)->set_observer(delegate); | 2096 ZoomController::FromWebContents(web_contents)->set_observer(delegate); |
| 2097 TranslateTabHelper* translate_tab_helper = | 2097 TranslateTabHelper* translate_tab_helper = |
| 2098 TranslateTabHelper::FromWebContents(web_contents); | 2098 TranslateTabHelper::FromWebContents(web_contents); |
| 2099 translate_tab_helper->language_state().set_observer( | 2099 translate_tab_helper->GetTranslateDriver()->SetLanguageStateObserver( |
| 2100 delegate ? delegate->language_state_observer_.get() : NULL); | 2100 delegate ? delegate->language_state_observer_.get() : NULL); |
| 2101 } | 2101 } |
| 2102 | 2102 |
| 2103 void Browser::CloseFrame() { | 2103 void Browser::CloseFrame() { |
| 2104 window_->Close(); | 2104 window_->Close(); |
| 2105 } | 2105 } |
| 2106 | 2106 |
| 2107 void Browser::TabDetachedAtImpl(content::WebContents* contents, | 2107 void Browser::TabDetachedAtImpl(content::WebContents* contents, |
| 2108 int index, | 2108 int index, |
| 2109 DetachType type) { | 2109 DetachType type) { |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2292 if (contents && !allow_js_access) { | 2292 if (contents && !allow_js_access) { |
| 2293 contents->web_contents()->GetController().LoadURL( | 2293 contents->web_contents()->GetController().LoadURL( |
| 2294 target_url, | 2294 target_url, |
| 2295 content::Referrer(), | 2295 content::Referrer(), |
| 2296 content::PAGE_TRANSITION_LINK, | 2296 content::PAGE_TRANSITION_LINK, |
| 2297 std::string()); // No extra headers. | 2297 std::string()); // No extra headers. |
| 2298 } | 2298 } |
| 2299 | 2299 |
| 2300 return contents != NULL; | 2300 return contents != NULL; |
| 2301 } | 2301 } |
| OLD | NEW |