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

chrome/browser/ui/browser_window.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_BROWSER_WINDOW_H_
 #define CHROME_BROWSER_UI_BROWSER_WINDOW_H_
 #pragma once
 
 #include "base/callback_forward.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/base_window.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
 #include "chrome/browser/ui/fullscreen_exit_bubble_type.h"
+#include "chrome/browser/ui/sync/one_click_signin_sync_starter.h"
 #include "chrome/common/content_settings_types.h"
 #include "ui/gfx/native_widget_types.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class Browser;
 class BrowserWindowTesting;
 class DownloadShelf;
 class FindBar;
 class GURL;
 class LocationBar;
@@ skipping 190 matching lines @@
   virtual void ShowBackgroundPages() = 0;
 
   // Shows the Bookmark bubble. |url| is the URL being bookmarked,
   // |already_bookmarked| is true if the url is already bookmarked.
   virtual void ShowBookmarkBubble(const GURL& url, bool already_bookmarked) = 0;
 
   // Shows the Chrome To Mobile bubble.
   virtual void ShowChromeToMobileBubble() = 0;
 
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
-  // Shows the one-click sign in bubble.  The given closures are run
-  // when their corresponding links are clicked.
+  // Callback type used with the ShowOneClickSigninBubble() method.  If the
+  // user chooses to accept the sign in, the callback is called to start the
+  // sync process.
+  typedef base::Callback<void(OneClickSigninSyncStarter::StartSyncMode)>
+      StartSyncCallback;
+
+  // Shows the one-click sign in bubble.
   virtual void ShowOneClickSigninBubble(
-      const base::Closure& learn_more_callback,
-      const base::Closure& advanced_callback) = 0;
+      const StartSyncCallback& start_sync_callback) = 0;
 #endif
 
   // Whether or not the shelf view is visible.
   virtual bool IsDownloadShelfVisible() const = 0;
 
   // Returns the DownloadShelf.
   virtual DownloadShelf* GetDownloadShelf() = 0;
 
   // Shows the confirmation dialog box warning that the browser is closing with
   // in-progress downloads.
@@ skipping 155 matching lines @@
 
   // Returns the ToolbarView.
   virtual ToolbarView* GetToolbarView() const = 0;
 #endif
 
  protected:
   virtual ~BrowserWindowTesting() {}
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_WINDOW_H_