Re-implement form validation message UI with native widgets. (Common and Mac)

chrome/browser/ui/cocoa/base_bubble_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 "chrome/browser/ui/cocoa/base_bubble_controller.h"
 
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/memory/scoped_nsobject.h"
@@ skipping 10 matching lines @@
                previousContents:(content::WebContents*)oldContents
                         atIndex:(NSInteger)index
                          reason:(int)reason;
 @end
 
 @implementation BaseBubbleController
 
 @synthesize parentWindow = parentWindow_;
 @synthesize anchorPoint = anchor_;
 @synthesize bubble = bubble_;
+@synthesize shouldOpenAsKeyWindow = shouldOpenAsKeyWindow_;
 
 - (id)initWithWindowNibPath:(NSString*)nibPath
                parentWindow:(NSWindow*)parentWindow
                  anchoredAt:(NSPoint)anchoredAt {
   nibPath = [base::mac::FrameworkBundle() pathForResource:nibPath
                                                    ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibPath owner:self])) {
     parentWindow_ = parentWindow;
     anchor_ = anchoredAt;

[Nico, 2013/04/29 22:35:48]

Nit: All other members are set up here, maybe move shouldOpenAsKeyWindow_ to
here

[tkent, 2013/04/29 23:08:01]

Done.

 
     // Watch to see if the parent window closes, and if so, close this one.
     NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
     [center addObserver:self
                selector:@selector(parentWindowWillClose:)
                    name:NSWindowWillCloseNotification
                  object:parentWindow_];
+    shouldOpenAsKeyWindow_ = YES;
   }
   return self;
 }
 
 - (id)initWithWindowNibPath:(NSString*)nibPath
              relativeToView:(NSView*)view
                      offset:(NSPoint)offset {
   DCHECK([view window]);
   NSWindow* window = [view window];
   NSRect bounds = [view convertRect:[view bounds] toView:nil];
@@ skipping 22 matching lines @@
     bubble_ = contentView.get();
 
     // Watch to see if the parent window closes, and if so, close this one.
     NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
     [center addObserver:self
                selector:@selector(parentWindowWillClose:)
                    name:NSWindowWillCloseNotification
                  object:parentWindow_];
 
     [self awakeFromNib];
+    shouldOpenAsKeyWindow_ = YES;

[Nico, 2013/04/29 22:35:48]

(likewise; probably at least want to do this before -awakeFromNib)

[tkent, 2013/04/29 23:08:01]

Done.

   }
   return self;
 }
 
 - (void)awakeFromNib {
   // Check all connections have been made in Interface Builder.
   DCHECK([self window]);
   DCHECK(bubble_);
   DCHECK_EQ(self, [[self window] delegate]);
 
@@ skipping 42 matching lines @@
 // We want this to be a child of a browser window.  addChildWindow:
 // (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:(id)sender {
   NSWindow* window = [self window];  // Completes nib load.
   [self updateOriginFromAnchor];
   [parentWindow_ addChildWindow:window ordered:NSWindowAbove];
-  [window makeKeyAndOrderFront:self];
+  if (shouldOpenAsKeyWindow_)
+    [window makeKeyAndOrderFront:self];
+  else
+    [window orderFront:nil];
   [self registerKeyStateEventTap];
 }
 
 - (void)close {
   // The bubble will be closing, so remove the event taps.
   if (eventTap_) {
     [NSEvent removeMonitor:eventTap_];
     eventTap_ = nil;
   }
   if (resignationObserver_) {
@@ skipping 116 matching lines @@
 
 - (void)activateTabWithContents:(content::WebContents*)newContents
                previousContents:(content::WebContents*)oldContents
                         atIndex:(NSInteger)index
                          reason:(int)reason {
   // The user switched tabs; close.
   [self close];
 }
 
 @end  // BaseBubbleController