GTK: Display a native bubble (instead of the JS one) after the web signin flow.

chrome/browser/ui/gtk/one_click_signin_bubble_gtk.h

Index: chrome/browser/ui/gtk/one_click_signin_bubble_gtk.h
diff --git a/chrome/browser/ui/gtk/one_click_signin_bubble_gtk.h b/chrome/browser/ui/gtk/one_click_signin_bubble_gtk.h
index 44efee5830f52484697d566c213ec065f9a440a3..82940deb3173f11225fa0ae3a4e11c0d63925e20 100644
--- a/chrome/browser/ui/gtk/one_click_signin_bubble_gtk.h
+++ b/chrome/browser/ui/gtk/one_click_signin_bubble_gtk.h
@@ -29,6 +29,7 @@ class OneClickSigninBubbleGtk : public BubbleDelegateGtk {
       BrowserWindowGtk* browser_window_gtk,
       BrowserWindow::OneClickSigninBubbleType type,
       const string16& email,
+      const string16& error_message,
       const BrowserWindow::StartSyncCallback& start_sync_callback);
 
   // BubbleDelegateGtk implementation.
@@ -36,10 +37,15 @@ class OneClickSigninBubbleGtk : public BubbleDelegateGtk {
       BubbleGtk* bubble, bool closed_by_escape) OVERRIDE;
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleGtkTest, ShowAndOK);
-  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleGtkTest, ShowAndUndo);
-  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleGtkTest, ShowAndClickAdvanced);
-  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleGtkTest, ShowAndClose);
+  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleGtkTest, DialogShowAndOK);
+  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleGtkTest, DialogShowAndUndo);
+  FRIEND_TEST_ALL_PREFIXES(
+    OneClickSigninBubbleGtkTest, DialogShowAndClickAdvanced);
+  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleGtkTest, DialogShowAndClose);
+  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleGtkTest, BubbleShowAndOK);
+  FRIEND_TEST_ALL_PREFIXES(
+    OneClickSigninBubbleGtkTest, BubbleShowAndClickAdvanced);
+  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleGtkTest, BubbleShowAndClose);
 
   virtual ~OneClickSigninBubbleGtk();
 
@@ -56,13 +62,16 @@ class OneClickSigninBubbleGtk : public BubbleDelegateGtk {
 
   BubbleGtk* bubble_;
 
+  const string16 email_;
+
+  const string16 error_message_;
+
   // This callback is nulled once its called, so that it is called only once.
   // It will be called when the bubble is closed if it has not been called
   // and nulled earlier.
   BrowserWindow::StartSyncCallback start_sync_callback_;
 
-  bool is_modal_;
-  const string16 email_;
+  bool is_sync_dialog_;
 
   GtkWidget* message_label_;
   GtkWidget* advanced_link_;