| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 // OS_WIN | 10 #endif // OS_WIN |
| (...skipping 3627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3638 void Browser::FindReply(WebContents* tab, | 3638 void Browser::FindReply(WebContents* tab, |
| 3639 int request_id, | 3639 int request_id, |
| 3640 int number_of_matches, | 3640 int number_of_matches, |
| 3641 const gfx::Rect& selection_rect, | 3641 const gfx::Rect& selection_rect, |
| 3642 int active_match_ordinal, | 3642 int active_match_ordinal, |
| 3643 bool final_update) { | 3643 bool final_update) { |
| 3644 FindReplyHelper(tab, request_id, number_of_matches, selection_rect, | 3644 FindReplyHelper(tab, request_id, number_of_matches, selection_rect, |
| 3645 active_match_ordinal, final_update); | 3645 active_match_ordinal, final_update); |
| 3646 } | 3646 } |
| 3647 | 3647 |
| 3648 void Browser::RequestToLockMouse(WebContents* tab, bool user_gesture) { | 3648 void Browser::RequestToLockMouse(WebContents* tab, |
| 3649 fullscreen_controller_->RequestToLockMouse(tab, user_gesture); | 3649 bool user_gesture, |
| 3650 bool after_unlocked_by_target) { |
| 3651 fullscreen_controller_->RequestToLockMouse(tab, user_gesture, |
| 3652 after_unlocked_by_target); |
| 3650 } | 3653 } |
| 3651 | 3654 |
| 3652 void Browser::LostMouseLock() { | 3655 void Browser::LostMouseLock() { |
| 3653 fullscreen_controller_->LostMouseLock(); | 3656 fullscreen_controller_->LostMouseLock(); |
| 3654 } | 3657 } |
| 3655 | 3658 |
| 3656 /////////////////////////////////////////////////////////////////////////////// | 3659 /////////////////////////////////////////////////////////////////////////////// |
| 3657 // Browser, CoreTabHelperDelegate implementation: | 3660 // Browser, CoreTabHelperDelegate implementation: |
| 3658 | 3661 |
| 3659 void Browser::SwapTabContents(TabContentsWrapper* old_tab_contents, | 3662 void Browser::SwapTabContents(TabContentsWrapper* old_tab_contents, |
| (...skipping 1450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5110 if (contents && !allow_js_access) { | 5113 if (contents && !allow_js_access) { |
| 5111 contents->web_contents()->GetController().LoadURL( | 5114 contents->web_contents()->GetController().LoadURL( |
| 5112 target_url, | 5115 target_url, |
| 5113 content::Referrer(), | 5116 content::Referrer(), |
| 5114 content::PAGE_TRANSITION_LINK, | 5117 content::PAGE_TRANSITION_LINK, |
| 5115 std::string()); // No extra headers. | 5118 std::string()); // No extra headers. |
| 5116 } | 5119 } |
| 5117 | 5120 |
| 5118 return contents != NULL; | 5121 return contents != NULL; |
| 5119 } | 5122 } |
| OLD | NEW |