diff options
| author | jeremya@chromium.org <jeremya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 04:39:05 +0000 |
|---|---|---|
| committer | jeremya@chromium.org <jeremya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 04:39:05 +0000 |
| commit | 986722f73cd178705ff514b632b4eed72143c73b (patch) | |
| tree | c8d6507689bfaae62ae7358effe9c31ca8f53ad7 /chrome/app | |
| parent | b72828b12489e2b5bac7a974e59e113d7d1f969f (diff) | |
| download | chromium_src-986722f73cd178705ff514b632b4eed72143c73b.zip chromium_src-986722f73cd178705ff514b632b4eed72143c73b.tar.gz chromium_src-986722f73cd178705ff514b632b4eed72143c73b.tar.bz2 | |
Fix up fullscreen exit bubble messages to suggest Esc instead of F11 where appropriate.
Mac:
- Show "<link>Exit full screen</link> (Esc)". Since Mac only shows the bubble in tab fullscreen mode, it never needs to display the Cmd-Shift-F shortcut.
Win, Linux:
- Show "<link>Exit full screen (Esc)</link>". Will change it to match the mac message in a followup CL; this was easier for now.
- Show "Press Esc to exit fullscreen" when mouse is locked.
- Show "<link>Exit full screen (F11)</link>" when in browser fullscreen mode.
BUG=99869
TEST=manual
Review URL: http://codereview.chromium.org/8528052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index cf4d722..0c127af 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -3617,14 +3617,12 @@ are declared in build/common.gypi. <!-- Fullscreen mode --> + <message name="IDS_EXIT_FULLSCREEN_MODE" desc="Clickable message displayed on entering full screen mode. Clicking on the link exits full screen mode."> + Exit full screen + </message> <if expr="not pp_ifdef('chromeos')"> - <message name="IDS_EXIT_FULLSCREEN_MODE" desc="Clickable message displayed on entering fullscreen mode to tell users how to return to normal mode"> - Exit full screen (<ph name="ACCELERATOR">$1<ex>F11</ex></ph>) - </message> - </if> - <if expr="pp_ifdef('chromeos')"> - <message name="IDS_EXIT_FULLSCREEN_MODE" desc="Clickable message displayed on entering fullscreen mode to tell users how to return to normal mode (for Chrome OS, which has a dedicated fullscreen key on the top row in the F3 position)"> - Exit full screen + <message name="IDS_EXIT_FULLSCREEN_MODE_ACCELERATOR" desc="Accelerator description shown next to a link showing 'Exit full screen' e.g. 'Exit full screen (Esc)', where 'Exit full screen' is a link."> + (<ph name="ACCELERATOR">$1<ex>Esc</ex></ph>) </message> </if> @@ -14410,7 +14408,7 @@ Keep your key file in a safe place. You will need it to create new versions of y This page is hiding your mouse cursor. </message> <message name="IDS_FULLSCREEN_PRESS_ESC_TO_EXIT" desc="Text displayed in the bubble to tell users how to return to normal mode"> - Press Esc to exit. + Press <ph name="ACCELERATOR">$1<ex>Esc</ex></ph> to exit. </message> <message name="IDS_FULLSCREEN_ALLOW" desc="Text in the bubble button that grants permission for a site to enter fullscreen and/or lock the mouse."> Allow |