Mac: Display a native bubble (instead of the JS one) after the web signin flow. (branched from http…

chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h

Index: chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h
diff --git a/chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h b/chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h
index 2086f355a85633fa14c697316dcce9704eb639cc..1fe85b5462108da77cda69e79463a452c2bc8a11 100644
--- a/chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h
+++ b/chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h
@@ -15,21 +15,27 @@
 @class BrowserWindowController;
 @class OneClickSigninViewController;
 
-// Displays the one-click signin confirmation bubble (after syncing
-// has started).
+// Displays the one-click signin confirmation bubble
 @interface OneClickSigninBubbleController : BaseBubbleController {
   scoped_nsobject<OneClickSigninViewController> viewController_;
+ @private
+   IBOutlet NSTextField* messageTextField_;
 }
 
 @property(readonly, nonatomic) OneClickSigninViewController* viewController;
 
-// Initializes with a browser window controller, under whose wrench
+// Initializes with a browser window |controller|, under whose wrench
 // menu this bubble will be displayed, and callbacks which are called
-// if the user clicks the corresponding link.
+// if the user clicks the corresponding link. |errorMessage| is an
+// alternate message that will be displayed in the case of an authentication
+// error, and |syncCallback| is called to start sync. |webContents| is used
+// to open the Learn More and Advanced links
 //
 // The bubble is not automatically displayed; call showWindow:id to
 // display.  The bubble is auto-released on close.
 - (id)initWithBrowserWindowController:(BrowserWindowController*)controller
+                          webContents:(content::WebContents*)webContents
+                         errorMessage:(const string16&)errorMessage

[Alexei Svitkine (slow), 2013/04/22 18:16:51]

Use an NSString* here too.

[noms (inactive), 2013/04/23 18:52:48]

Done.

                              callback:(const BrowserWindow::StartSyncCallback&)
                                           syncCallback;