Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(704)

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 10830210: Fix crbug.com/140910 (BrowsingDataRemover not working). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More places fixed, added DCHECK and conversion to BrowsingDataRemover. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 1067 matching lines...) Expand 10 before | Expand all | Expand 10 after
1078 } 1078 }
1079 1079
1080 void SigninScreenHandler::StartClearingCookies() { 1080 void SigninScreenHandler::StartClearingCookies() {
1081 cookies_cleared_ = false; 1081 cookies_cleared_ = false;
1082 if (cookie_remover_) 1082 if (cookie_remover_)
1083 cookie_remover_->RemoveObserver(this); 1083 cookie_remover_->RemoveObserver(this);
1084 1084
1085 cookie_remover_ = new BrowsingDataRemover( 1085 cookie_remover_ = new BrowsingDataRemover(
1086 Profile::FromWebUI(web_ui()), 1086 Profile::FromWebUI(web_ui()),
1087 BrowsingDataRemover::EVERYTHING, 1087 BrowsingDataRemover::EVERYTHING,
1088 base::Time()); 1088 base::Time::Now());
1089 cookie_remover_->AddObserver(this); 1089 cookie_remover_->AddObserver(this);
1090 cookie_remover_->Remove(BrowsingDataRemover::REMOVE_SITE_DATA, 1090 cookie_remover_->Remove(BrowsingDataRemover::REMOVE_SITE_DATA,
1091 BrowsingDataHelper::UNPROTECTED_WEB); 1091 BrowsingDataHelper::UNPROTECTED_WEB);
1092 } 1092 }
1093 1093
1094 void SigninScreenHandler::MaybePreloadAuthExtension() { 1094 void SigninScreenHandler::MaybePreloadAuthExtension() {
1095 // Fetching of the extension is not started before account picker page is 1095 // Fetching of the extension is not started before account picker page is
1096 // loaded because it can affect the loading speed. Also if |cookie_remover_| 1096 // loaded because it can affect the loading speed. Also if |cookie_remover_|
1097 // or |dns_clear_task_running_| then auth extension showing has already been 1097 // or |dns_clear_task_running_| then auth extension showing has already been
1098 // initiated and preloading is senseless. 1098 // initiated and preloading is senseless.
1099 // Do not load the extension for the screen locker, see crosbug.com/25018. 1099 // Do not load the extension for the screen locker, see crosbug.com/25018.
1100 if (is_account_picker_showing_first_time_ && 1100 if (is_account_picker_showing_first_time_ &&
1101 !gaia_silent_load_ && 1101 !gaia_silent_load_ &&
1102 !ScreenLocker::default_screen_locker() && 1102 !ScreenLocker::default_screen_locker() &&
1103 !cookie_remover_ && 1103 !cookie_remover_ &&
1104 !dns_clear_task_running_ && 1104 !dns_clear_task_running_ &&
1105 network_state_informer_->is_online()) { 1105 network_state_informer_->is_online()) {
1106 gaia_silent_load_ = true; 1106 gaia_silent_load_ = true;
1107 gaia_silent_load_network_ = 1107 gaia_silent_load_network_ =
1108 network_state_informer_->active_network_service_path(); 1108 network_state_informer_->active_network_service_path();
1109 LoadAuthExtension(true, true, false); 1109 LoadAuthExtension(true, true, false);
1110 } 1110 }
1111 } 1111 }
1112 1112
1113 } // namespace chromeos 1113 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698