Fix up fullscreen exit bubble messages to suggest Esc instead of F11 where appropriate.

chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm

 // Copyright (c) 2011 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"  // for NOTREACHED()
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #include "chrome/browser/ui/fullscreen_exit_bubble_type.h"
 #include "grit/generated_resources.h"
+#include "grit/ui_strings.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/models/accelerator_cocoa.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 
 namespace {
 const int kBubbleOffsetY = 10;
 const float kInitialDelay = 3.8;
 const float kHideDuration = 0.7;
 } // namespace
 
 @interface OneClickHyperlinkTextView : HyperlinkTextView
@@ skipping 123 matching lines @@
         fullscreen_bubble::GetDenyButtonTextForType(bubbleType))];
     [self showButtons:YES];
 
     // Reenable mouse events if they were disabled previously.
     [[self window] setIgnoresMouseEvents:NO];
   } else {
     [self showButtons:NO];
     // Only button-less bubbles auto-hide.
     [self hideSoon];
   }
+  // TODO(jeremya): show "Press Esc to exit" instead of a link on mouselock.
 
   // Relayout. A bit jumpy, but functional.
   [tweaker_ tweakUI:[self window]];
   NSRect windowFrame = [owner_ window].frame;
   [self positionInWindowAtTop:NSHeight(windowFrame) width:NSWidth(windowFrame)];
 }
 
 // Called when someone clicks on the embedded link.
 - (BOOL) textView:(NSTextView*)textView
     clickedOnLink:(id)link
@@ skipping 51 matching lines @@
   exitLabel_.reset([[OneClickHyperlinkTextView alloc]
       initWithFrame:[exitLabelPlaceholder_ frame]]);
   [exitLabel_.get() setAutoresizingMask:
       [exitLabelPlaceholder_ autoresizingMask]];
   [exitLabel_.get() setHidden:[exitLabelPlaceholder_ isHidden]];
   [[exitLabelPlaceholder_ superview]
       replaceSubview:exitLabelPlaceholder_ with:exitLabel_.get()];
   exitLabelPlaceholder_ = nil;  // Now released.
   [exitLabel_.get() setDelegate:self];
 
-  NSString *message = l10n_util::GetNSStringF(IDS_EXIT_FULLSCREEN_MODE,
-      base::SysNSStringToUTF16([[self class] keyCommandString]));
+  NSString *exit_link_text = l10n_util::GetNSString(IDS_EXIT_FULLSCREEN_MODE);

[Nico, 2011/11/15 05:22:02]

Space after *, not before. Variables in ObjC called haveCamelCase.

[jeremya, 2011/11/15 05:29:13]

Done.

+  NSString *accelerator_text = [@" " stringByAppendingString:
+      l10n_util::GetNSStringF(IDS_EXIT_FULLSCREEN_MODE_ACCELERATOR,
+                              l10n_util::GetStringUTF16(IDS_APP_ESC_KEY))];
 
   NSFont* font = [NSFont systemFontOfSize:
       [NSFont systemFontSizeForControlSize:NSRegularControlSize]];
   [(HyperlinkTextView*)exitLabel_.get()
-        setMessageAndLink:@""
-                 withLink:message
+        setMessageAndLink:accelerator_text
+                 withLink:exit_link_text
                  atOffset:0
                      font:font
              messageColor:[NSColor blackColor]
                 linkColor:[NSColor blueColor]];
   [exitLabel_.get() setAlignment:NSRightTextAlignment];
 
   NSRect labelFrame = [exitLabel_ frame];
 
   // NSTextView's sizeToFit: method seems to enjoy wrapping lines. Temporarily
   // set the size large to force it not to.
   NSRect windowFrame = [[self window] frame];
   [exitLabel_ setFrameSize:windowFrame.size];
   NSLayoutManager* layoutManager = [exitLabel_ layoutManager];
   NSTextContainer* textContainer = [exitLabel_ textContainer];
   [layoutManager ensureLayoutForTextContainer:textContainer];
   NSRect textFrame = [layoutManager usedRectForTextContainer:textContainer];
 
+  textFrame.size.width = ceil(textFrame.size.width);

[Nico, 2011/11/15 05:22:02]

NSWidth() on the right

[jeremya, 2011/11/15 05:29:13]

Done.

   labelFrame.origin.x += NSWidth(labelFrame) - NSWidth(textFrame);
   labelFrame.size = textFrame.size;
   [exitLabel_ setFrame:labelFrame];
 }
 
 // This looks at the Main Menu and determines what the user has set as the
 // key combination for quit. It then gets the modifiers and builds an object
 // to hold the data.
 + (ui::AcceleratorCocoa)acceleratorForToggleFullscreen {
   NSMenu* mainMenu = [NSApp mainMenu];
@@ skipping 42 matching lines @@
 - (void)hideSoon {
   hideTimer_.reset(
       [[NSTimer scheduledTimerWithTimeInterval:kInitialDelay
                                         target:self
                                       selector:@selector(hideTimerFired:)
                                       userInfo:nil
                                        repeats:NO] retain]);
 }
 
 @end