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

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

Issue 10173030: User Gesture plumbed from Renderer to Browser's FullscreenController::RequestToLockMouse. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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 | Annotate | Revision Log
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 4017 matching lines...) Expand 10 before | Expand all | Expand 10 after
4028 void Browser::FindReply(WebContents* tab, 4028 void Browser::FindReply(WebContents* tab,
4029 int request_id, 4029 int request_id,
4030 int number_of_matches, 4030 int number_of_matches,
4031 const gfx::Rect& selection_rect, 4031 const gfx::Rect& selection_rect,
4032 int active_match_ordinal, 4032 int active_match_ordinal,
4033 bool final_update) { 4033 bool final_update) {
4034 FindReplyHelper(tab, request_id, number_of_matches, selection_rect, 4034 FindReplyHelper(tab, request_id, number_of_matches, selection_rect,
4035 active_match_ordinal, final_update); 4035 active_match_ordinal, final_update);
4036 } 4036 }
4037 4037
4038 void Browser::RequestToLockMouse(WebContents* tab) { 4038 void Browser::RequestToLockMouse(WebContents* tab, bool user_gesture) {
4039 fullscreen_controller_->RequestToLockMouse(tab); 4039 fullscreen_controller_->RequestToLockMouse(tab, user_gesture);
4040 } 4040 }
4041 4041
4042 void Browser::LostMouseLock() { 4042 void Browser::LostMouseLock() {
4043 fullscreen_controller_->LostMouseLock(); 4043 fullscreen_controller_->LostMouseLock();
4044 } 4044 }
4045 4045
4046 /////////////////////////////////////////////////////////////////////////////// 4046 ///////////////////////////////////////////////////////////////////////////////
4047 // Browser, CoreTabHelperDelegate implementation: 4047 // Browser, CoreTabHelperDelegate implementation:
4048 4048
4049 void Browser::SwapTabContents(TabContentsWrapper* old_tab_contents, 4049 void Browser::SwapTabContents(TabContentsWrapper* old_tab_contents,
(...skipping 1450 matching lines...) Expand 10 before | Expand all | Expand 10 after
5500 if (contents && !allow_js_access) { 5500 if (contents && !allow_js_access) {
5501 contents->web_contents()->GetController().LoadURL( 5501 contents->web_contents()->GetController().LoadURL(
5502 target_url, 5502 target_url,
5503 content::Referrer(), 5503 content::Referrer(),
5504 content::PAGE_TRANSITION_LINK, 5504 content::PAGE_TRANSITION_LINK,
5505 std::string()); // No extra headers. 5505 std::string()); // No extra headers.
5506 } 5506 }
5507 5507
5508 return contents != NULL; 5508 return contents != NULL;
5509 } 5509 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698