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_view_controller.h

Index: chrome/browser/ui/cocoa/one_click_signin_view_controller.h
diff --git a/chrome/browser/ui/cocoa/one_click_signin_view_controller.h b/chrome/browser/ui/cocoa/one_click_signin_view_controller.h
index c3d2ae76279f84e6ac9675d2447563b4cf4ddc67..8bc4c543c6122e6ee88ca734f1e2940fb893a735 100644
--- a/chrome/browser/ui/cocoa/one_click_signin_view_controller.h
+++ b/chrome/browser/ui/cocoa/one_click_signin_view_controller.h
@@ -25,6 +25,9 @@ class WebContents;
   IBOutlet NSButton* advancedLink_;
   IBOutlet NSButton* closeButton_;
 
+  BOOL isSyncDialog_;
+  NSString* errorMessage_;

[Alexei Svitkine (slow), 2013/04/23 19:43:24]

This should be a scoped_nsobject.

[noms (inactive), 2013/04/24 14:49:30]

Done.

+
   // Text fields don't work as well with embedded links as text views, but
   // text views cannot conveniently be created in IB. The xib file contains
   // a text field |informativePlaceholderTextField_| that's replaced by this
@@ -35,10 +38,17 @@ class WebContents;
   content::WebContents* webContents_;
 }
 
+// Initializes the controller from a nib file, with an alternate |errorMessage|
+// that can be displayed in the case of an authentication error,
+// |syncCallback| is called to start sync if |isSyncDialog| is YES,
+// |webContents| is used to open the Learn More and Advanced links and
+// |callback| is called when the view is closing.
 - (id)initWithNibName:(NSString*)nibName
           webContents:(content::WebContents*)webContents
          syncCallback:(const BrowserWindow::StartSyncCallback&)syncCallback
-        closeCallback:(const base::Closure&)callback;
+        closeCallback:(const base::Closure&)callback
+         isSyncDialog:(BOOL)isSyncDialog
+         errorMessage:(NSString*)errorMessage;
 
 // Called before the view is closed.
 - (void)viewWillClose;