Bug fix for the pointer lock string problem

chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"  // for NOTREACHED()
 #include "base/mac/bundle_locations.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 26 matching lines @@
 @interface OneClickHyperlinkTextView : HyperlinkTextView
 @end
 @implementation OneClickHyperlinkTextView
 - (BOOL)acceptsFirstMouse:(NSEvent*)event {
   return YES;
 }
 @end
 
 @interface ExclusiveAccessBubbleWindowController (PrivateMethods)
 // Sets |exitLabel_| based on |exitLabelPlaceholder_|,
-// sets |exitLabelPlaceholder_| to nil.
-- (void)initializeLabel;
+// sets |exitLabelPlaceholder_| to nil,
+// sets |denyButton_| text based on |bubbleType_|.
+- (void)initializeLabelAndButton;
 
 - (NSString*)getLabelText;
 
 - (void)hideSoon;
 
 // Returns the Accelerator for the Toggle Fullscreen menu item.
 + (scoped_ptr<ui::PlatformAcceleratorCocoa>)acceleratorForToggleFullscreen;
 
 // Returns a string representation fit for display of
 // +acceleratorForToggleFullscreen.
@@ skipping 55 matching lines @@
 // (called from this function) will bring the window on-screen;
 // unfortunately, [NSWindowController showWindow:] will also bring it
 // on-screen (but will cause unexpected changes to the window's
 // position).  We cannot have an addChildWindow: and a subsequent
 // showWindow:. Thus, we have our own version.
 - (void)showWindow {
   // Completes nib load.
   InfoBubbleWindow* info_bubble = static_cast<InfoBubbleWindow*>([self window]);
   [info_bubble setCanBecomeKeyWindow:NO];
   if (!exclusive_access_bubble::ShowButtonsForType(bubbleType_)) {
-    [self showButtons:NO];
     [self hideSoon];
   }
   [tweaker_ tweakUI:info_bubble];
   [[owner_ window] addChildWindow:info_bubble ordered:NSWindowAbove];
   [owner_ layoutSubviews];
 
   [info_bubble orderFront:self];
 }
 
 - (void)awakeFromNib {
   DCHECK([[self window] isKindOfClass:[InfoBubbleWindow class]]);
   [messageLabel_ setStringValue:[self getLabelText]];
-  [self initializeLabel];
+  [self initializeLabelAndButton];
 }
 
 - (void)positionInWindowAtTop:(CGFloat)maxY width:(CGFloat)maxWidth {
   NSRect windowFrame = [self window].frame;
   NSRect ownerWindowFrame = [owner_ window].frame;
   NSPoint origin;
   origin.x = ownerWindowFrame.origin.x +
              (int)(NSWidth(ownerWindowFrame) / 2 - NSWidth(windowFrame) / 2);
   origin.y = ownerWindowFrame.origin.y + maxY - NSHeight(windowFrame);
   [[self window] setFrameOrigin:origin];
@@ skipping 42 matching lines @@
 - (void)dealloc {
   [hideAnimation_.get() stopAnimation];
   [hideTimer_ invalidate];
   [super dealloc];
 }
 
 @end
 
 @implementation ExclusiveAccessBubbleWindowController (PrivateMethods)
 
-- (void)initializeLabel {
+- (void)initializeLabelAndButton {
   // Replace the label placeholder NSTextField with the real label NSTextView.
   // The former doesn't show links in a nice way, but the latter can't be added
   // in IB without a containing scroll view, so create the NSTextView
   // programmatically.
   exitLabel_.reset([[OneClickHyperlinkTextView alloc]
       initWithFrame:[exitLabelPlaceholder_ frame]]);
   [exitLabel_.get()
       setAutoresizingMask:[exitLabelPlaceholder_ autoresizingMask]];
   [exitLabel_.get() setHidden:[exitLabelPlaceholder_ isHidden]];
   [[exitLabelPlaceholder_ superview] replaceSubview:exitLabelPlaceholder_
@@ skipping 40 matching lines @@
   [exitLabel_ setFrameSize:windowFrame.size];
   NSLayoutManager* layoutManager = [exitLabel_ layoutManager];
   NSTextContainer* textContainer = [exitLabel_ textContainer];
   [layoutManager ensureLayoutForTextContainer:textContainer];
   NSRect textFrame = [layoutManager usedRectForTextContainer:textContainer];
 
   textFrame.size.width = ceil(NSWidth(textFrame));
   labelFrame.origin.x += NSWidth(labelFrame) - NSWidth(textFrame);
   labelFrame.size = textFrame.size;
   [exitLabel_ setFrame:labelFrame];
+
+  // Update the title of denyButton_ according to the current bubbleType_,
+  // or show no button at all.
+  if (exclusive_access_bubble::ShowButtonsForType(bubbleType_)) {
+    NSString* denyButtonText =
+      SysUTF16ToNSString(
+        exclusive_access_bubble::GetDenyButtonTextForType(bubbleType_));
+    [denyButton_ setTitle:denyButtonText];
+  } else {
+    [self showButtons:NO];
+  }
 }
 
 - (NSString*)getLabelText {
   if (bubbleType_ == EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE)
     return @"";
   extensions::ExtensionRegistry* registry =
       extensions::ExtensionRegistry::Get(browser_->profile());
   return SysUTF16ToNSString(exclusive_access_bubble::GetLabelTextForType(
       bubbleType_, url_, registry));
 }
@@ skipping 52 matching lines @@
 - (void)hideSoon {
   hideTimer_.reset(
       [[NSTimer scheduledTimerWithTimeInterval:kInitialDelay
                                         target:self
                                       selector:@selector(hideTimerFired:)
                                       userInfo:nil
                                        repeats:NO] retain]);
 }
 
 @end