chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.cc - Issue 1814983003: Add an experimental keyboard lock, where Esc must be held to exit.

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

Issue 1814983003: Add an experimental keyboard lock, where Esc must be held to exit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressing comment nit Created 4 years, 9 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_type.h ('k') | chrome/browser/ui/exclusive_access/exclusive_access_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 1d012b591a1a3776fa60f1778c3865f99c0a5adf..ab2e1e0a3f28273d2017a418cffa20b103d878c6 100644

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

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

@@ -35,6 +35,7 @@ base::string16 GetLabelTextForType(ExclusiveAccessBubbleType type,

switch (type) {

case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_BUTTONS:

case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_EXIT_INSTRUCTION:

+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_KEYBOARD_LOCK_EXIT_INSTRUCTION:

return l10n_util::GetStringUTF16(IDS_FULLSCREEN_ENTERED_FULLSCREEN);

case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS:

return l10n_util::GetStringUTF16(

@@ -70,6 +71,7 @@ base::string16 GetLabelTextForType(ExclusiveAccessBubbleType type,

return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_SITE_REQUEST_MOUSELOCK,

host);

case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_EXIT_INSTRUCTION:

+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_KEYBOARD_LOCK_EXIT_INSTRUCTION:

return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_SITE_ENTERED_FULLSCREEN,

host);

case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION:

@@ -100,6 +102,7 @@ base::string16 GetDenyButtonTextForType(ExclusiveAccessBubbleType type) {

case EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_BUTTONS:

return l10n_util::GetStringUTF16(IDS_FULLSCREEN_DENY);

case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_EXIT_INSTRUCTION:

+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_KEYBOARD_LOCK_EXIT_INSTRUCTION:

case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION:

case EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_EXIT_INSTRUCTION:

case EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION:

@@ -127,6 +130,7 @@ base::string16 GetAllowButtonTextForType(ExclusiveAccessBubbleType type,

case EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_BUTTONS:

return l10n_util::GetStringUTF16(IDS_FULLSCREEN_ALLOW);

case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_EXIT_INSTRUCTION:

+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_KEYBOARD_LOCK_EXIT_INSTRUCTION:

case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION:

case EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_EXIT_INSTRUCTION:

case EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION:

@@ -156,6 +160,9 @@ base::string16 GetInstructionTextForType(ExclusiveAccessBubbleType type,

// to trigger fullscreen result in the same message.

return l10n_util::GetStringFUTF16(

IDS_FULLSCREEN_PRESS_ESC_TO_EXIT_FULLSCREEN, accelerator);

+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_KEYBOARD_LOCK_EXIT_INSTRUCTION:

+ return l10n_util::GetStringFUTF16(

+ IDS_FULLSCREEN_HOLD_ESC_TO_EXIT_FULLSCREEN, accelerator);

case EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_EXIT_INSTRUCTION:

return l10n_util::GetStringFUTF16(

IDS_FULLSCREEN_PRESS_ESC_TO_EXIT_MOUSELOCK, accelerator);