Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Side by Side Diff: chrome/browser/ui/fullscreen_exit_bubble.cc

Issue 8528052: Fix up fullscreen exit bubble messages to suggest Esc instead of F11 where appropriate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove irrelevant test Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/fullscreen_exit_bubble.h" 5 #include "chrome/browser/ui/fullscreen_exit_bubble.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "grit/generated_resources.h" 10 #include "grit/generated_resources.h"
11 #include "grit/ui_strings.h"
11 #include "ui/base/l10n/l10n_util.h" 12 #include "ui/base/l10n/l10n_util.h"
12 #include "ui/gfx/rect.h" 13 #include "ui/gfx/rect.h"
13 14
14 const int FullscreenExitBubble::kPaddingPx = 8; 15 const int FullscreenExitBubble::kPaddingPx = 8;
15 const int FullscreenExitBubble::kInitialDelayMs = 3800; 16 const int FullscreenExitBubble::kInitialDelayMs = 3800;
16 const int FullscreenExitBubble::kIdleTimeMs = 2300; 17 const int FullscreenExitBubble::kIdleTimeMs = 2300;
17 const int FullscreenExitBubble::kPositionCheckHz = 10; 18 const int FullscreenExitBubble::kPositionCheckHz = 10;
18 const int FullscreenExitBubble::kSlideInRegionHeightPx = 4; 19 const int FullscreenExitBubble::kSlideInRegionHeightPx = 4;
19 const int FullscreenExitBubble::kSlideInDurationMs = 350; 20 const int FullscreenExitBubble::kSlideInDurationMs = 350;
20 const int FullscreenExitBubble::kSlideOutDurationMs = 700; 21 const int FullscreenExitBubble::kSlideOutDurationMs = 700;
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 118
118 string16 FullscreenExitBubble::GetCurrentDenyButtonText() const { 119 string16 FullscreenExitBubble::GetCurrentDenyButtonText() const {
119 return fullscreen_bubble::GetDenyButtonTextForType(bubble_type_); 120 return fullscreen_bubble::GetDenyButtonTextForType(bubble_type_);
120 } 121 }
121 122
122 string16 FullscreenExitBubble::GetAllowButtonText() const { 123 string16 FullscreenExitBubble::GetAllowButtonText() const {
123 return l10n_util::GetStringUTF16(IDS_FULLSCREEN_ALLOW); 124 return l10n_util::GetStringUTF16(IDS_FULLSCREEN_ALLOW);
124 } 125 }
125 126
126 string16 FullscreenExitBubble::GetInstructionText() const { 127 string16 FullscreenExitBubble::GetInstructionText() const {
127 return l10n_util::GetStringUTF16(IDS_FULLSCREEN_PRESS_ESC_TO_EXIT); 128 return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_PRESS_ESC_TO_EXIT,
129 l10n_util::GetStringUTF16(IDS_APP_ESC_KEY));
128 } 130 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698