Forced cookie removal before sign-in page is shown.

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

 // Copyright (c) 2011 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/webui/chromeos/login/signin_screen_handler.h"
 
 #include "base/command_line.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/power_library.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 const char kDefaultDomain[] = "@gmail.com";
 
 // Account picker screen id.
 const char kAccountPickerScreen[] = "account-picker";
 // Sign in screen id.
@@ skipping 159 matching lines @@
   base::StringValue error_message(error_text);
   base::StringValue help_link(help_link_text);
   base::FundamentalValue help_id(static_cast<int>(help_topic_id));
   web_ui_->CallJavascriptFunction("cr.ui.Oobe.showSignInError",
                                   login_attempts_value,
                                   error_message,
                                   help_link,
                                   help_id);
 }
 
+void SigninScreenHandler::OnBrowsingDataRemoverDone() {
+  // Show sign in screen as soon as we clear the cookie jar.
+  DictionaryValue params;
+  params.SetString("email", email_);
+  params.SetString("startUrl", kGaiaExtStartPage);
+  params.SetBoolean("createAccount",
+      UserCrosSettingsProvider::cached_allow_new_user());
+  params.SetBoolean("guestSignin",
+      UserCrosSettingsProvider::cached_allow_guest());
+  email_.clear();
+  ShowScreen(kGaiaSigninScreen, &params);
+}
+
 void SigninScreenHandler::HandleCompleteLogin(const base::ListValue* args) {
   std::string username;
   std::string password;
   if (!args->GetString(0, &username) ||
       !args->GetString(1, &password)) {
     NOTREACHED();
     return;
   }
 
   username = SanitizeEmail(username);
@@ skipping 27 matching lines @@
   if (!args->GetString(0, &email)) {
     NOTREACHED();
     return;
   }
 
   delegate_->RemoveUser(email);
 }
 
 void SigninScreenHandler::HandleShowAddUser(const base::ListValue* args) {
   if (extension_driven_) {
-    DictionaryValue params;
-    params.SetString("startUrl", kGaiaExtStartPage);
-
-    std::string email;
+    email_.clear();
     // |args| can be null if it's OOBE.
-    if (args && args->GetString(0, &email))
-      params.SetString("email", email);
-
-    params.SetBoolean("createAccount",
-        UserCrosSettingsProvider::cached_allow_new_user());
-    params.SetBoolean("guestSignin",
-        UserCrosSettingsProvider::cached_allow_guest());
-
-    ShowScreen(kGaiaSigninScreen, &params);
+    if (args && args->GetString(0, &email_)) {
+      StartClearingCookies();

[xiyuan, 2011/08/13 15:43:21]

Think we want to clear cookie regardless of whether we have an email to use or
not, e.g. http://crosbug.com/18925 where we want to show add user UI but reauth
UI might show up because of previous success sign-in.

[zel, 2011/08/15 06:24:34]

Good catch. Done.

+    }
   } else {
     ShowScreen(kSigninScreen, NULL);
   }
 }
 
 void SigninScreenHandler::HandleToggleEnrollmentScreen(
     const base::ListValue* args) {
   delegate_->ShowEnterpriseEnrollmentScreen();
 }
 
@@ skipping 78 matching lines @@
   // Call the Javascript callback
   base::FundamentalValue animated_value(animated);
   web_ui_->CallJavascriptFunction("login.AccountPickerScreen.loadUsers",
                                   users_list, animated_value);
 }
 
 void SigninScreenHandler::HandleCreateAccount(const base::ListValue* args) {
   delegate_->CreateAccount();
 }
 
+void SigninScreenHandler::StartClearingCookies() {
+  BrowsingDataRemover* remover = new BrowsingDataRemover(
+      Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context()),
+      BrowsingDataRemover::EVERYTHING,
+      base::Time());
+  remover->AddObserver(this);
+  remover->Remove(BrowsingDataRemover::REMOVE_COOKIES |
+                  BrowsingDataRemover::REMOVE_LSO_DATA);
+

[xiyuan, 2011/08/13 15:43:21]

nit: nuke this empty line

[zel, 2011/08/15 06:24:34]

Done.

+}
+
 }  // namespace chromeos