Added multi-login support to one-click signin.

chrome/browser/ui/views/one_click_signin_dialog_views.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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/dialog_style.h"
@@ skipping 15 matching lines @@
 
 // Heading font size correction.
 const int kHeadingFontSizeDelta = 1;
 const int kMinColumnWidth = 320;
 
 // A dialog explaining to the user more about one click signin, and provides
 // a way for the user to continue or backout.
 class OneClickSigninDialogView : public views::DialogDelegateView {
  public:
   OneClickSigninDialogView(Profile* profile,
+                           const std::string& session_index,
                            const std::string& email,
                            const std::string& password);
   virtual ~OneClickSigninDialogView();
 
  private:
   // views::DialogDelegateView:
   virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
   virtual int GetDefaultDialogButton() const OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
   // views::WidgetDelegate:
   virtual ui::ModalType GetModalType() const OVERRIDE;
   virtual string16 GetWindowTitle() const OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
 
   Profile* profile_;
   views::Checkbox* checkbox_;
 
-  // Email address and password of the account that has just logged in.
+  // Information about the account that has just logged in.
+  std::string session_index_;
   std::string email_;
   std::string password_;
 
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninDialogView);
 };
 
 OneClickSigninDialogView::OneClickSigninDialogView(
     Profile* profile,
+    const std::string& session_index,
     const std::string& email,
     const std::string& password)
     : profile_(profile),
       checkbox_(NULL),
+      session_index_(session_index),
       email_(email),
       password_(password) {
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
   const int kColumnSetId = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(kColumnSetId);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,  // resizable
                         views::GridLayout::USE_PREF,
@@ skipping 46 matching lines @@
   return ui::DIALOG_BUTTON_OK;
 }
 
 bool OneClickSigninDialogView::Cancel() {
   return true;
 }
 
 bool OneClickSigninDialogView::Accept() {
   // The starter deletes itself once its done.
   OneClickSigninSyncStarter* starter =
-      new OneClickSigninSyncStarter(email_, password_, profile_,
+      new OneClickSigninSyncStarter(session_index_, email_, password_, profile_,
                                     checkbox_->checked());
   return true;
 }
 
 ui::ModalType OneClickSigninDialogView::GetModalType() const {
   return ui::MODAL_TYPE_WINDOW;
 }
 
 string16 OneClickSigninDialogView::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_ONE_CLICK_SIGNIN_DIALOG_TITLE);
 }
 
 views::View* OneClickSigninDialogView::GetContentsView() {
   return this;
 }
 
 }  // namespace
 
 
 void ShowOneClickSigninDialog(Profile* profile,
+                              const std::string& session_index,
                               const std::string& email,
                               const std::string& password) {
   Browser* browser = BrowserList::GetLastActiveWithProfile(profile);
   if (!browser)
     return;
 
   BrowserWindow* browser_window = browser->window();
   if (!browser_window)
     return;
 
   OneClickSigninDialogView* dialog = new OneClickSigninDialogView(
-      profile, email, password);
+      profile, session_index, email, password);
 
   views::Widget* window =  browser::CreateViewsWindow(
       browser_window->GetNativeHandle(), dialog, STYLE_GENERIC);
 
   window->Show();
 }