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

chrome/browser/ui/sync/one_click_signin_helper.cc

 // 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.
 
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/metrics/histogram.h"
 #include "base/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/sync/one_click_signin_dialog.h"
 #include "chrome/browser/ui/sync/one_click_signin_histogram.h"
 #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/frame_navigate_params.h"
@@ skipping 20 matching lines @@
 
  private:
   // ConfirmInfoBarDelegate overrides.
   virtual void InfoBarDismissed() OVERRIDE;
   virtual gfx::Image* GetIcon() const OVERRIDE;
   virtual Type GetInfoBarType() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
+  virtual string16 GetLinkText() const OVERRIDE;
+  virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
 
   virtual InfoBarAutomationType GetInfoBarAutomationType() const OVERRIDE;
 
   // Set the profile preference to turn off one-click sign in so that it won't
   // show again in this profile.
   void DisableOneClickSignIn();
 
   // Record the specified action in the histogram for one-click sign in.
   void RecordHistogramAction(int action);
 
@@ skipping 46 matching lines @@
 
 string16 OneClickLoginInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16(
       (button == BUTTON_OK) ? IDS_ONE_CLICK_SIGNIN_INFOBAR_OK_BUTTON
                             : IDS_ONE_CLICK_SIGNIN_INFOBAR_CANCEL_BUTTON);
 }
 
 namespace {
 
-void OnLearnMore(Browser* browser) {
-  browser->AddSelectedTabWithURL(
-      GURL(chrome::kSyncLearnMoreURL),
-      content::PAGE_TRANSITION_AUTO_BOOKMARK);
-}
-
-void OnAdvanced(Browser* browser) {
-  browser->AddSelectedTabWithURL(
-      GURL(std::string(chrome::kChromeUISettingsURL) +
-           chrome::kSyncSetupSubPage),
-      content::PAGE_TRANSITION_AUTO_BOOKMARK);
-}
-
 // Start syncing with the given user information.
 void StartSync(content::WebContents* web_contents,
                const std::string& session_index,
                const std::string& email,
                const std::string& password,
-               bool use_default_settings) {
+               OneClickSigninSyncStarter::StartSyncMode start_mode) {
   // The starter deletes itself once its done.
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
-  ignore_result(
-      new OneClickSigninSyncStarter(
-          profile, session_index, email, password, use_default_settings));
-
-  Browser* browser = browser::FindBrowserWithWebContents(web_contents);
-  browser->window()->ShowOneClickSigninBubble(
-      base::Bind(&OnLearnMore, base::Unretained(browser)),
-      base::Bind(&OnAdvanced, base::Unretained(browser)));
+  new OneClickSigninSyncStarter(profile, session_index, email, password,
+                                start_mode);
 }
 
 }  // namespace
 
 bool OneClickLoginInfoBarDelegate::Accept() {
   DisableOneClickSignIn();
+  content::WebContents* web_contents = owner()->web_contents();
   RecordHistogramAction(one_click_signin::HISTOGRAM_ACCEPTED);
-  ShowOneClickSigninDialog(
-      owner()->web_contents()->GetView()->GetTopLevelNativeWindow(),
-      base::Bind(&StartSync, owner()->web_contents(), session_index_, email_,
-                 password_));
+  browser::FindBrowserWithWebContents(web_contents)->window()->
+      ShowOneClickSigninBubble(base::Bind(&StartSync, web_contents,
+                                          session_index_, email_, password_));
   button_pressed_ = true;
   return true;
 }
 
 bool OneClickLoginInfoBarDelegate::Cancel() {
   DisableOneClickSignIn();
   RecordHistogramAction(one_click_signin::HISTOGRAM_REJECTED);
   button_pressed_ = true;
   return true;
 }
 
+string16 OneClickLoginInfoBarDelegate::GetLinkText() const {
+  return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
+}
+
+bool OneClickLoginInfoBarDelegate::LinkClicked(
+    WindowOpenDisposition disposition) {
+  RecordHistogramAction(one_click_signin::HISTOGRAM_LEARN_MORE);
+  content::OpenURLParams params(
+      GURL(chrome::kChromeSyncLearnMoreURL), content::Referrer(), disposition,
+      content::PAGE_TRANSITION_LINK,
+      false);

[Peter Kasting, 2012/05/25 21:09:33]

Nit: Since you're combining args on multiple lines anyway, go ahead and combine
this with the previous line; also OK to put as many args as will fit on the same
line as the called function name

[Roger Tawa OOO till Jul 10th, 2012/05/26 01:56:02]

Done.

+  owner()->web_contents()->OpenURL(params);
+  return false;
+}
+
+
 InfoBarDelegate::InfoBarAutomationType
     OneClickLoginInfoBarDelegate::GetInfoBarAutomationType() const {
   return ONE_CLICK_LOGIN_INFOBAR;
 }
 
 void OneClickLoginInfoBarDelegate::DisableOneClickSignIn() {
   PrefService* pref_service =
       TabContentsWrapper::GetCurrentWrapperForContents(
           owner()->web_contents())->profile()->GetPrefs();
   pref_service->SetBoolean(prefs::kReverseAutologinEnabled, false);
@@ skipping 151 matching lines @@
   session_index_ = session_index;
   email_ = email;
 }
 
 void OneClickSigninHelper::SavePassword(const std::string& password) {
   // TODO(rogerta): in the case of a 2-factor or captcha or some other type of
   // challenge, its possible for the user to never complete the signin.
   // Should have a way to detect this and clear the password member.
   password_ = password;
 }