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

chrome/browser/ui/cocoa/browser_window_cocoa.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.
 
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
@@ skipping 468 matching lines @@
 void BrowserWindowCocoa::ShowChromeToMobileBubble() {
   [controller_ showChromeToMobileBubble];
 }
 
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
 void BrowserWindowCocoa::ShowOneClickSigninBubble(
     OneClickSigninBubbleType type,
     const string16& email,
     const string16& error_message,
     const StartSyncCallback& start_sync_callback) {
+  WebContents* web_contents =
+        browser_->tab_strip_model()->GetActiveWebContents();
   if (type == ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE) {
     scoped_nsobject<OneClickSigninBubbleController> bubble_controller(
         [[OneClickSigninBubbleController alloc]
             initWithBrowserWindowController:cocoa_controller()
+                                webContents:web_contents
+                               errorMessage:base::SysUTF16ToNSString(
+                                                error_message)
                                    callback:start_sync_callback]);
     [bubble_controller showWindow:nil];
   } else {
-    WebContents* web_contents =
-        browser_->tab_strip_model()->GetActiveWebContents();
     // Deletes itself when the dialog closes.
     new OneClickSigninDialogController(web_contents, start_sync_callback);
   }
 }
 #endif
 
 bool BrowserWindowCocoa::IsDownloadShelfVisible() const {
   return [controller_ isDownloadShelfVisible] != NO;
 }
 
@@ skipping 198 matching lines @@
   PasswordGenerationBubbleController* controller =
       [[PasswordGenerationBubbleController alloc]
         initWithWindow:browser_->window()->GetNativeWindow()
             anchoredAt:point
         renderViewHost:web_contents->GetRenderViewHost()
         passwordManager:PasswordManager::FromWebContents(web_contents)
         usingGenerator:password_generator
                forForm:form];
   [controller showWindow:nil];
 }