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.

[Mark Mentovai, 2015/01/27 21:32:16]

Revise comment.

[Jialiu Lin, 2015/01/28 02:47:09]

Done.

 - (void)initializeLabel;
 
 - (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
@@ skipping 193 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_
+  if (bubbleType_ == EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_BUTTONS ||

[Mark Mentovai, 2015/01/27 21:32:16]

Call exclusive_access_bubble::ShowButtonsForType() instead of duplicating its
logic here.

[Jialiu Lin, 2015/01/28 02:47:09]

Done.

+      bubbleType_ ==
+          EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS ||
+      bubbleType_ == EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_BUTTONS) {
+    NSString* denyButtonText =
+      SysUTF16ToNSString(
+        exclusive_access_bubble::GetDenyButtonTextForType(bubbleType_));

[Mark Mentovai, 2015/01/27 21:32:16]

Since you’re now always populating the deny button text (if the deny button is
to be shown) right here, I think you should remove the to-be-localized text from
the nib. That will prevent the work from being done to get the default
IDS_FULLSCREEN_DENY label if it’s just going to be overwritten, and the
duplicate work from being done to get it twice if it’s in fact the correct
label. It will also provide a better visual indication of a problem (label-less
button?) in case this code doesn’t execute properly.

[Jialiu Lin, 2015/01/28 02:47:09]

Done.

+    [denyButton_ setTitle:denyButtonText];
+  }

[Mark Mentovai, 2015/01/27 21:32:16]

Perhaps the showButtons:NO call should be here in an else instead of in
-showWindow. Conceptually, I believe it makes more sense to do it here because
it’s a choice between “set proper button text” and “don’t show button at all”.
The ShowButtonsForType() check in -showWindow isn’t as much about showing or
hiding the buttons as it is about arranging to dismiss the window when no
buttons are present. Hiding the buttons is more related to this code than that
code.

With this change, I’m starting to think that this method could be named
something better than -initializeLabel, since it’s now doing more than just
initializing its label.

[Jialiu Lin, 2015/01/28 02:47:08]

Added the else clause, and changed the function name to 
-initializeLabelAndButton

 }
 
 - (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