Windowed mode mouse lock addded to fullscreen controller.

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/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
@@ skipping 102 matching lines @@
 // 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 (!fullscreen_bubble::ShowButtonsForType(bubbleType_)) {
     [self showButtons:NO];
     [self hideSoon];
   }
-  NSRect windowFrame = [owner_ window].frame;
   [tweaker_ tweakUI:info_bubble];
-  [self positionInWindowAtTop:NSHeight(windowFrame) width:NSWidth(windowFrame)];
   [[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];
 }
 
 - (void)positionInWindowAtTop:(CGFloat)maxY width:(CGFloat)maxWidth {
   NSRect windowFrame = [self window].frame;
+  NSRect ownerWindowFrame = [owner_ window].frame;
   NSPoint origin;
-  origin.x = (int)(maxWidth/2 - NSWidth(windowFrame)/2);
-  origin.y = maxY - NSHeight(windowFrame);
+  origin.x = ownerWindowFrame.origin.x +
+      (int)(NSWidth(ownerWindowFrame)/2 - NSWidth(windowFrame)/2);
+  origin.y = ownerWindowFrame.origin.y + maxY - NSHeight(windowFrame);
   [[self window] setFrameOrigin:origin];
 }
 
 - (void)updateURL:(const GURL&)url
        bubbleType:(FullscreenExitBubbleType)bubbleType {
   bubbleType_ = bubbleType;
 
   [messageLabel_ setStringValue:[self getLabelText]];
 
   // Make sure the bubble is visible.
@@ skipping 10 matching lines @@
     [[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)];
+  [owner_ layoutSubviews];
 }
 
 // Called when someone clicks on the embedded link.
 - (BOOL) textView:(NSTextView*)textView
     clickedOnLink:(id)link
           atIndex:(NSUInteger)charIndex {
   browser_->ExecuteCommand(IDC_FULLSCREEN);
   return YES;
 }
 
@@ skipping 80 matching lines @@
   [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];
 }
 
 - (NSString*)getLabelText {
+  if (bubbleType_ == FEB_TYPE_NONE)
+    return @"";
   return SysUTF16ToNSString(fullscreen_bubble::GetLabelTextForType(
           bubbleType_, url_, browser_->profile()->GetExtensionService()));
 }
 
 // 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];
   // Get the application menu (i.e. Chromium).
@@ skipping 41 matching lines @@
 - (void)hideSoon {
   hideTimer_.reset(
       [[NSTimer scheduledTimerWithTimeInterval:kInitialDelay
                                         target:self
                                       selector:@selector(hideTimerFired:)
                                       userInfo:nil
                                        repeats:NO] retain]);
 }
 
 @end