Fullscreen / mouselock bubble: Use new theming even when flag disabled.

chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/exclusive_access/exclusive_access_bubble.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 163 matching lines @@
 base::string16 ExclusiveAccessBubble::GetCurrentDenyButtonText() const {
   return exclusive_access_bubble::GetDenyButtonTextForType(bubble_type_);
 }
 
 base::string16 ExclusiveAccessBubble::GetCurrentAllowButtonText() const {
   return exclusive_access_bubble::GetAllowButtonTextForType(bubble_type_, url_);
 }
 
 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_,
                                                             accelerator);
 }
 
 void ExclusiveAccessBubble::ShowAndStartTimers() {
   Show();
 
   // Do not allow the notification to hide for a few seconds.
   hide_timeout_.Start(FROM_HERE,
                       base::TimeDelta::FromMilliseconds(kInitialDelayMs), this,
                       &ExclusiveAccessBubble::CheckMousePosition);
 
   // Do not show the notification again until a long time has elapsed.
   suppress_notify_timeout_.Start(
       FROM_HERE, base::TimeDelta::FromMilliseconds(kSnoozeNotificationsTimeMs),
       this, &ExclusiveAccessBubble::CheckMousePosition);
 }