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.mm

Index: chrome/browser/ui/cocoa/one_click_signin_bubble_controller.mm
diff --git a/chrome/browser/ui/cocoa/one_click_signin_bubble_controller.mm b/chrome/browser/ui/cocoa/one_click_signin_bubble_controller.mm
index bebaaa0ae9e6f4559b20bd22c68109d4711cba29..6126103b4cb2c4f7a7f37c0770c4657a91d52b00 100644
--- a/chrome/browser/ui/cocoa/one_click_signin_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/one_click_signin_bubble_controller.mm
@@ -4,6 +4,7 @@
 
 #import "chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h"
 
+#include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #import "chrome/browser/ui/cocoa/one_click_signin_view_controller.h"
@@ -20,14 +21,18 @@ void PerformClose(OneClickSigninBubbleController* controller) {
 @implementation OneClickSigninBubbleController
 
 - (id)initWithBrowserWindowController:(BrowserWindowController*)controller
+                          webContents:(content::WebContents*)webContents
+                         errorMessage:(NSString*)errorMessage
                              callback:(const BrowserWindow::StartSyncCallback&)
-                                          syncCallback {
+                                                                  syncCallback{
   viewController_.reset([[OneClickSigninViewController alloc]
       initWithNibName:@"OneClickSigninBubble"
-          webContents:NULL
+          webContents:webContents
          syncCallback:syncCallback
         closeCallback:base::Bind(PerformClose, self)
-        isModalDialog:NO]);
+         isSyncDialog:NO
+         errorMessage:errorMessage]);
+
   NSWindow* parentWindow = [controller window];
 
   // Set the anchor point to right below the wrench menu.
@@ -52,6 +57,7 @@ void PerformClose(OneClickSigninBubbleController* controller) {
     // -[BaseBubbleController windowWillClose:].
     [self retain];
   }
+
   return self;
 }