chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc - Issue 903683005: Always prompt for permission on fullscreen and mouse lock on file:// URLs

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc

Issue 903683005: Always prompt for permission on fullscreen and mouse lock on file:// URLs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: style fixes and remove unused includes Created 5 years, 10 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/exclusive_access/exclusive_access_bubble.h ('k') | chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h » ('j') | chrome/browser/ui/website_settings/permission_menu_model_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc

diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc

index 178e97da676f62b47c684252d9838b92c0345427..b960ce187b799c89dc697a0afddd49dcd40b7d22 100644

--- a/chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc

+++ b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc

@@ -138,8 +138,8 @@ base::string16 ExclusiveAccessBubble::GetCurrentDenyButtonText() const {

return exclusive_access_bubble::GetDenyButtonTextForType(bubble_type_);

}

-base::string16 ExclusiveAccessBubble::GetAllowButtonText() const {

- return l10n_util::GetStringUTF16(IDS_FULLSCREEN_ALLOW);

+base::string16 ExclusiveAccessBubble::GetCurrentAllowButtonText() const {

+ return exclusive_access_bubble::GetAllowButtonTextForType(bubble_type_, url_);

}

base::string16 ExclusiveAccessBubble::GetInstructionText() const {