chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc - Issue 1972543002: Fullscreen / mouselock bubble: Use new theming even when flag disabled.

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 1972543002: Fullscreen / mouselock bubble: Use new theming even when flag disabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fullscreen-remove-permission

Patch Set: Respond to review. Created 4 years, 7 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/app/generated_resources.grd ('k') | chrome/browser/ui/views/exclusive_access_bubble_views.cc » ('j') | chrome/browser/ui/views/exclusive_access_bubble_views.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 142e304104b3b12e1d5fcfca9eaffbe5b0153306..a1850446894825f201b4fa0cef7ea47ba7268626 100644

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

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

@@ -181,10 +181,15 @@ base::string16 ExclusiveAccessBubble::GetCurrentAllowButtonText() const {

base::string16 ExclusiveAccessBubble::GetInstructionText(

const base::string16& accelerator) const {

+#if defined(OS_MACOSX)

+ // On Mac, if simplified-fullscreen is disabled, the Cocoa code is unable to

+ // deal with the special formatting returned by GetInstructionTextForType, so

+ // just return the old string.

if (!ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) {

return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_PRESS_ESC_TO_EXIT_SENTENCE,

accelerator);

}

+#endif

return exclusive_access_bubble::GetInstructionTextForType(bubble_type_,

accelerator);