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..b907713ff2f0d16b2e88b88747c6813d17ba8081 100644 |
--- a/chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc |
+++ b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc |
@@ -165,8 +165,15 @@ base::string16 ExclusiveAccessBubble::GetCurrentAllowButtonText() const { |
} |
base::string16 ExclusiveAccessBubble::GetInstructionText() const { |
- return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_PRESS_ESC_TO_EXIT, |
- l10n_util::GetStringUTF16(IDS_APP_ESC_KEY)); |
+ if (ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) { |
+ return l10n_util::GetStringFUTF16( |
+ IDS_FULLSCREEN_PRESS_ESC_TO_EXIT, |
+ l10n_util::GetStringUTF16(IDS_APP_ESC_KEY)); |
+ } else { |
msw
2015/10/29 17:50:02
no else after return
Matt Giuca
2015/11/09 06:35:12
Done.
|
+ return l10n_util::GetStringFUTF16( |
+ IDS_FULLSCREEN_PRESS_ESC_TO_EXIT_SENTENCE, |
+ l10n_util::GetStringUTF16(IDS_APP_ESC_KEY)); |
+ } |
} |
void ExclusiveAccessBubble::ShowAndStartTimers() { |