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

chrome/browser/ui/gtk/one_click_signin_bubble_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_ONE_CLICK_SIGNIN_BUBBLE_GTK_H_
 #define CHROME_BROWSER_UI_GTK_ONE_CLICK_SIGNIN_BUBBLE_GTK_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
+#include "chrome/browser/ui/base_window.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h"
 
 typedef struct _GtkWidget GtkWidget;
 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 BrowserWindow::StartSyncCallback& start_sync_callback);
 
   // BubbleDelegateGtk implementation.
   virtual void BubbleClosing(
       BubbleGtk* bubble, bool closed_by_escape) OVERRIDE;
 
   void ClickOKForTest();

[Peter Kasting, 2012/05/24 22:25:18]

Nit: The implementations of these are so simple that it would be nice to either
use FRIEND_TEST_ALL_PREFIXES() instead and inline these directly in the tests,
or else implement them in a base class of all the browsertests and then friend
that class.

[Roger Tawa OOO till Jul 10th, 2012/05/25 16:04:08]

I like it better as is if you don't have huge objections.

[Peter Kasting, 2012/05/25 16:58:06]

My problem with XXXForTest() is that it still leaks encapsulation, it just asks
nicely that people not misuse it.  The compiler can't catch this.

I think these can be useful when they're big, complex implementations that would
be unwieldy to move elsewhere, but in all other cases, it's much better to use
the FRIEND_TEST mechanism (or a friend test base class) as this allows the
compiler to still ensure no one else uses the object's internals.  This also
discourages people from later renaming XXXForTest() to just XXX() when they
decide they want to use it more broadly -- something we've had happen in the
past.

This also leaves the least code in the class itself, which optimizes for
class-level readability and compile size -- though the differences in this case
are tiny.

Finally, this is more consistent with typical Chrome patterns -- XXXForTest() is
used orders of magnitude less frequently.

-  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_;
+
+  // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninBubbleGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_ONE_CLICK_SIGNIN_BUBBLE_GTK_H_