Update behavior of one-click infobar to remove modal dialog, add "undo".

chrome/browser/ui/cocoa/one_click_signin_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/one_click_signin_bubble_controller.h"
 
 #include "base/logging.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
@@ skipping 11 matching lines @@
   NSPoint origin = [view frame].origin;
   origin.y += amount;
   [view setFrameOrigin:origin];
 }
 
 }  // namespace
 
 @implementation OneClickSigninBubbleController
 
 - (id)initWithBrowserWindowController:(BrowserWindowController*)controller
-                    learnMoreCallback:(const base::Closure&)learnMoreCallback
-                     advancedCallback:(const base::Closure&)advancedCallback {
+      start_sync_callback:(const base::Callback<void(bool)>&)

[akalin, 2012/05/17 00:39:24]

line up : here too

[Roger Tawa OOO till Jul 10th, 2012/05/17 21:17:37]

Done.

+          start_sync_callback {
   NSWindow* parentWindow = [controller window];
 
   // Set the anchor point to right below the wrench menu.
   NSView* wrenchButton = [[controller toolbarController] wrenchButton];
   const NSRect bounds = [wrenchButton bounds];
   NSPoint anchorPoint = NSMakePoint(NSMidX(bounds), NSMaxY(bounds));
   anchorPoint = [wrenchButton convertPoint:anchorPoint toView:nil];
   anchorPoint = [parentWindow convertBaseToScreen:anchorPoint];
 
   if (self = [super initWithWindowNibPath:@"OneClickSigninBubble"
                              parentWindow:parentWindow
                                anchoredAt:anchorPoint]) {
-    learnMoreCallback_ = learnMoreCallback;
-    advancedCallback_ = advancedCallback;
-    DCHECK(!learnMoreCallback_.is_null());
-    DCHECK(!advancedCallback_.is_null());
+    start_sync_callback_ = start_sync_callback;
+    DCHECK(!start_sync_callback_.is_null());
   }
   return self;
 }
 
 - (IBAction)ok:(id)sender {
+  start_sync_callback_.Run(true);
   [self close];
 }
 
-- (IBAction)onClickLearnMoreLink:(id)sender {
-  learnMoreCallback_.Run();
+- (IBAction)undo:(id)sender {
+  [self close];
 }
 
 - (IBAction)onClickAdvancedLink:(id)sender {
-  advancedCallback_.Run();
+  start_sync_callback_.Run(false);
+  // TODO(rogerta): why not close bubble now?

[akalin, 2012/05/17 00:39:24]

Navigating to a page already closes the infobar on Mac.  But, yeah, you can
explicitly close here for completeness.

[Roger Tawa OOO till Jul 10th, 2012/05/17 21:17:37]

Will close explicitly then.  The advanced page comes up in a new tab.

 }
 
+// TODO(rogerta): if the bubble is closed without interaction, need to call
+// the callback with argument set to true.
+
 - (void)awakeFromNib {
   [super awakeFromNib];
 
   // Set the message text manually, since we have to interpolate the
   // product name.
   NSString* message =
       l10n_util::GetNSStringF(
           IDS_SYNC_PROMO_NTP_BUBBLE_MESSAGE,
           l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
   [messageField_ setStringValue:message];
 
   // Lay out the text controls from the bottom up.
   CGFloat totalYOffset = 0.0;
 
   totalYOffset +=
       [GTMUILocalizerAndLayoutTweaker sizeToFitView:advancedLink_].height;
 
-  ShiftOriginY(learnMoreLink_, totalYOffset);
-  totalYOffset +=

[akalin, 2012/05/17 00:39:24]

why did you remove this?

[Roger Tawa OOO till Jul 10th, 2012/05/17 21:17:37]

I removed this because the learn more link is no longer supposed to be in the
bubble.  However, since I did not change the nib thing yet, I'll put the code
back in with a comment for you to take it out.

-      [GTMUILocalizerAndLayoutTweaker sizeToFitView:learnMoreLink_].height;
-
   ShiftOriginY(messageField_, totalYOffset);
   totalYOffset +=
       [GTMUILocalizerAndLayoutTweaker
           sizeToFitFixedWidthTextField:messageField_];
 
   NSSize delta = NSMakeSize(0.0, totalYOffset);
 
   // Resize bubble and window to hold the controls.
   [GTMUILocalizerAndLayoutTweaker
       resizeViewWithoutAutoResizingSubViews:[self bubble]
                                       delta:delta];
   [GTMUILocalizerAndLayoutTweaker
       resizeWindowWithoutAutoResizingSubViews:[self window]
                                         delta:delta];
 }
 
 @end  // OneClickSigninBubbleController