Update behavior of one-click infobar to remove modal dialog, add "undo".

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 12fed1019b235c548c0b64503a745cd20b782b25..7af7c96d18009f1cba787063716e3888ee32cff3 100644
--- a/chrome/browser/ui/gtk/one_click_signin_bubble_gtk.h
+++ b/chrome/browser/ui/gtk/one_click_signin_bubble_gtk.h
@@ -16,34 +16,35 @@ typedef struct _GtkWindow GtkWindow;
 
 class BrowserWindowGtk;
 
-// Displays the one-click signin confirmation bubble (after syncing
+// Displays the one-click signin confirmation bubble (before syncing
 // has started).
 class OneClickSigninBubbleGtk : public BubbleDelegateGtk {
  public:
-  // Deletes self on close.  The given callbacks will be called if the
-  // user clicks the corresponding link.
-  OneClickSigninBubbleGtk(BrowserWindowGtk* browser_window_gtk,
-                          const base::Closure& learn_more_callback,
-                          const base::Closure& advanced_callback);
+  // Deletes self on close.  The given callback will be called if the
+  // user decides to start sync.
+  OneClickSigninBubbleGtk(
+      BrowserWindowGtk* browser_window_gtk,
+      const base::Callback<void(bool)>& start_sync_callback);
 
   // BubbleDelegateGtk implementation.
   virtual void BubbleClosing(
       BubbleGtk* bubble, bool closed_by_escape) OVERRIDE;
 
   void ClickOKForTest();
-  void ClickLearnMoreForTest();
+  void ClickUndoForTest();
   void ClickAdvancedForTest();
+  void CloseForTest();
 
  private:
   virtual ~OneClickSigninBubbleGtk();
 
-  CHROMEGTK_CALLBACK_0(OneClickSigninBubbleGtk, void, OnClickLearnMoreLink);
   CHROMEGTK_CALLBACK_0(OneClickSigninBubbleGtk, void, OnClickAdvancedLink);
   CHROMEGTK_CALLBACK_0(OneClickSigninBubbleGtk, void, OnClickOK);
+  CHROMEGTK_CALLBACK_0(OneClickSigninBubbleGtk, void, OnClickUndo);
 
   BubbleGtk* bubble_;
-  const base::Closure learn_more_callback_;
-  const base::Closure advanced_callback_;
+  const base::Callback<void(bool)> start_sync_callback_;
+  bool call_sync_callback_on_close_;

[akalin, 2012/05/17 00:39:24]

seems cleaner to me to remove the bool, make the callback non-const, have a
method like 

void MaybeStartSync(x) { if (!start_sync_callback_.is_null())
base::ResetAndRun(&start_sync_callback_).Run(x); }

Then you can replace the bool fiddling with MaybeStartSync() calls

[Roger Tawa OOO till Jul 10th, 2012/05/17 21:17:37]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninBubbleGtk);
 };