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 a1850446894825f201b4fa0cef7ea47ba7268626..7a43692011ba65e81046a925f150567b74c0a026 100644 |
--- a/chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc |
+++ b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc |
@@ -181,16 +181,6 @@ base::string16 ExclusiveAccessBubble::GetCurrentAllowButtonText() const { |
base::string16 ExclusiveAccessBubble::GetInstructionText( |
const base::string16& accelerator) const { |
-#if defined(OS_MACOSX) |
- // On Mac, if simplified-fullscreen is disabled, the Cocoa code is unable to |
- // deal with the special formatting returned by GetInstructionTextForType, so |
- // just return the old string. |
- if (!ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) { |
- return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_PRESS_ESC_TO_EXIT_SENTENCE, |
- accelerator); |
- } |
-#endif |
- |
return exclusive_access_bubble::GetInstructionTextForType(bubble_type_, |
tapted
2016/05/25 03:53:27
Can ExclusiveAccessBubbleViews::UpdateViewContent(
Matt Giuca
2016/05/26 04:15:40
No, because EABV doesn't have access to bubble_typ
tapted
2016/05/26 05:08:41
Sure it does. It assigns it in fact.
https://code
Matt Giuca
2016/05/26 05:57:30
Oh OK, gross. Well I still think this is a useful
|
accelerator); |
} |