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

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 10443045: Silent mouse lock after unlock by target (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: nit changes Created 8 years, 6 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
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 last_unlocked_by_target) {
3651 fullscreen_controller_->RequestToLockMouse(tab,
3652 user_gesture,
3653 last_unlocked_by_target);
3650 } 3654 }
3651 3655
3652 void Browser::LostMouseLock() { 3656 void Browser::LostMouseLock() {
3653 fullscreen_controller_->LostMouseLock(); 3657 fullscreen_controller_->LostMouseLock();
3654 } 3658 }
3655 3659
3656 /////////////////////////////////////////////////////////////////////////////// 3660 ///////////////////////////////////////////////////////////////////////////////
3657 // Browser, CoreTabHelperDelegate implementation: 3661 // Browser, CoreTabHelperDelegate implementation:
3658 3662
3659 void Browser::SwapTabContents(TabContentsWrapper* old_tab_contents, 3663 void Browser::SwapTabContents(TabContentsWrapper* old_tab_contents,
(...skipping 1450 matching lines...) Expand 10 before | Expand all | Expand 10 after
5110 if (contents && !allow_js_access) { 5114 if (contents && !allow_js_access) {
5111 contents->web_contents()->GetController().LoadURL( 5115 contents->web_contents()->GetController().LoadURL(
5112 target_url, 5116 target_url,
5113 content::Referrer(), 5117 content::Referrer(),
5114 content::PAGE_TRANSITION_LINK, 5118 content::PAGE_TRANSITION_LINK,
5115 std::string()); // No extra headers. 5119 std::string()); // No extra headers.
5116 } 5120 }
5117 5121
5118 return contents != NULL; 5122 return contents != NULL;
5119 } 5123 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698