diff options
Diffstat (limited to 'chrome/browser/ui/exclusive_access')
-rw-r--r-- | chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc | 10 | ||||
-rw-r--r-- | chrome/browser/ui/exclusive_access/exclusive_access_bubble.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc index fe4de87..292a872 100644 --- a/chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc +++ b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc @@ -177,15 +177,15 @@ base::string16 ExclusiveAccessBubble::GetCurrentAllowButtonText() const { return exclusive_access_bubble::GetAllowButtonTextForType(bubble_type_, url_); } -base::string16 ExclusiveAccessBubble::GetInstructionText() const { +base::string16 ExclusiveAccessBubble::GetInstructionText( + const base::string16& accelerator) 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_SENTENCE, + accelerator); } return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_PRESS_ESC_TO_EXIT, - l10n_util::GetStringUTF16(IDS_APP_ESC_KEY)); + accelerator); } void ExclusiveAccessBubble::ShowAndStartTimers() { diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h index 049df29..1d13e46 100644 --- a/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h +++ b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h @@ -95,10 +95,10 @@ class ExclusiveAccessBubble : public gfx::AnimationDelegate { base::string16 GetCurrentDenyButtonText() const; base::string16 GetCurrentAllowButtonText() const; - // The following strings never change. // This string *may* contain the name of the key surrounded in pipe characters // ('|'), which should be drawn graphically as a key, not displayed literally. - base::string16 GetInstructionText() const; + // |accelerator| is the name of the key to exit fullscreen mode. + base::string16 GetInstructionText(const base::string16& accelerator) const; // The Manager associated with this bubble. ExclusiveAccessManager* const manager_; |