chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc - Issue 1421813005: Fullscreen bubble: Draw a white box around "ESC" in "Press ESC to exit".

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 1421813005: Fullscreen bubble: Draw a white box around "ESC" in "Press ESC to exit". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@border-roundedrect

Patch Set: Respond to comments. Also early-return. Created 5 years, 1 month 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/views/exclusive_access_bubble_views.cc » ('j') | no next file with comments »
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 2d0233ce7410e452e69693e54fdcec3d9765f1c9..abf28c29e187eede4389622515a94f27348f0b86 100644

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

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

@@ -165,6 +165,12 @@ base::string16 ExclusiveAccessBubble::GetCurrentAllowButtonText() const {

}

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

+ if (!ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) {

+ return l10n_util::GetStringFUTF16(

+ IDS_FULLSCREEN_PRESS_ESC_TO_EXIT_SENTENCE,

+ l10n_util::GetStringUTF16(IDS_APP_ESC_KEY));

+ }

return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_PRESS_ESC_TO_EXIT,

l10n_util::GetStringUTF16(IDS_APP_ESC_KEY));

}