| 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 1285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1296 // external navigation. | 1296 // external navigation. |
| 1297 if ((operations_allowed & blink::WebDragOperationLink) && | 1297 if ((operations_allowed & blink::WebDragOperationLink) && |
| 1298 chrome::SettingsWindowManager::GetInstance()->IsSettingsBrowser(this)) { | 1298 chrome::SettingsWindowManager::GetInstance()->IsSettingsBrowser(this)) { |
| 1299 return false; | 1299 return false; |
| 1300 } | 1300 } |
| 1301 return true; | 1301 return true; |
| 1302 } | 1302 } |
| 1303 | 1303 |
| 1304 content::SecurityStyle Browser::GetSecurityStyle( | 1304 content::SecurityStyle Browser::GetSecurityStyle( |
| 1305 const WebContents* web_contents) { | 1305 const WebContents* web_contents) { |
| 1306 return ConnectionSecurityHelper::GetSecurityStyleForWebContents(web_contents); | 1306 return connection_security::GetSecurityStyleForWebContents(web_contents); |
| 1307 } | 1307 } |
| 1308 | 1308 |
| 1309 bool Browser::IsMouseLocked() const { | 1309 bool Browser::IsMouseLocked() const { |
| 1310 return exclusive_access_manager_->mouse_lock_controller()->IsMouseLocked(); | 1310 return exclusive_access_manager_->mouse_lock_controller()->IsMouseLocked(); |
| 1311 } | 1311 } |
| 1312 | 1312 |
| 1313 void Browser::OnWindowDidShow() { | 1313 void Browser::OnWindowDidShow() { |
| 1314 if (window_has_shown_) | 1314 if (window_has_shown_) |
| 1315 return; | 1315 return; |
| 1316 window_has_shown_ = true; | 1316 window_has_shown_ = true; |
| (...skipping 1306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2623 if (contents && !allow_js_access) { | 2623 if (contents && !allow_js_access) { |
| 2624 contents->web_contents()->GetController().LoadURL( | 2624 contents->web_contents()->GetController().LoadURL( |
| 2625 target_url, | 2625 target_url, |
| 2626 content::Referrer(), | 2626 content::Referrer(), |
| 2627 ui::PAGE_TRANSITION_LINK, | 2627 ui::PAGE_TRANSITION_LINK, |
| 2628 std::string()); // No extra headers. | 2628 std::string()); // No extra headers. |
| 2629 } | 2629 } |
| 2630 | 2630 |
| 2631 return contents != NULL; | 2631 return contents != NULL; |
| 2632 } | 2632 } |
| OLD | NEW |