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

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

Issue 10413072: Teaching BrowsingDataRemover how to delete application data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Inadvertant include. Created 8 years, 7 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 1011 matching lines...) Expand 10 before | Expand all | Expand 10 after
1022 base::Bind(&SigninScreenHandler::OnDnsCleared, 1022 base::Bind(&SigninScreenHandler::OnDnsCleared,
1023 weak_factory_.GetWeakPtr())); 1023 weak_factory_.GetWeakPtr()));
1024 dns_clear_task_running_ = true; 1024 dns_clear_task_running_ = true;
1025 } 1025 }
1026 1026
1027 void SigninScreenHandler::StartClearingCookies() { 1027 void SigninScreenHandler::StartClearingCookies() {
1028 cookies_cleared_ = false; 1028 cookies_cleared_ = false;
1029 if (cookie_remover_) 1029 if (cookie_remover_)
1030 cookie_remover_->RemoveObserver(this); 1030 cookie_remover_->RemoveObserver(this);
1031 1031
1032 bool include_protected_origins = false;
1032 cookie_remover_ = new BrowsingDataRemover( 1033 cookie_remover_ = new BrowsingDataRemover(
1033 Profile::FromWebUI(web_ui()), 1034 Profile::FromWebUI(web_ui()),
1034 BrowsingDataRemover::EVERYTHING, 1035 BrowsingDataRemover::EVERYTHING,
1035 base::Time()); 1036 base::Time());
1036 cookie_remover_->AddObserver(this); 1037 cookie_remover_->AddObserver(this);
1037 cookie_remover_->Remove(BrowsingDataRemover::REMOVE_SITE_DATA); 1038 cookie_remover_->Remove(BrowsingDataRemover::REMOVE_SITE_DATA,
1039 include_protected_origins);
Evan Stade 2012/05/23 23:13:27 ditto
1038 } 1040 }
1039 1041
1040 void SigninScreenHandler::MaybePreloadAuthExtension() { 1042 void SigninScreenHandler::MaybePreloadAuthExtension() {
1041 // Fetching of the extension is not started before account picker page is 1043 // Fetching of the extension is not started before account picker page is
1042 // loaded because it can affect the loading speed. Also if |cookie_remover_| 1044 // loaded because it can affect the loading speed. Also if |cookie_remover_|
1043 // or |dns_clear_task_running_| then auth extension showing has already been 1045 // or |dns_clear_task_running_| then auth extension showing has already been
1044 // initiated and preloading is senseless. 1046 // initiated and preloading is senseless.
1045 // Do not load the extension for the screen locker, see crosbug.com/25018. 1047 // Do not load the extension for the screen locker, see crosbug.com/25018.
1046 if (is_account_picker_showing_first_time_ && 1048 if (is_account_picker_showing_first_time_ &&
1047 !gaia_silent_load_ && 1049 !gaia_silent_load_ &&
1048 !ScreenLocker::default_screen_locker() && 1050 !ScreenLocker::default_screen_locker() &&
1049 !cookie_remover_ && 1051 !cookie_remover_ &&
1050 !dns_clear_task_running_ && 1052 !dns_clear_task_running_ &&
1051 network_state_informer_->is_online()) { 1053 network_state_informer_->is_online()) {
1052 gaia_silent_load_ = true; 1054 gaia_silent_load_ = true;
1053 gaia_silent_load_network_ = 1055 gaia_silent_load_network_ =
1054 network_state_informer_->active_network_service_path(); 1056 network_state_informer_->active_network_service_path();
1055 LoadAuthExtension(true, true, false); 1057 LoadAuthExtension(true, true, false);
1056 } 1058 }
1057 } 1059 }
1058 1060
1059 } // namespace chromeos 1061 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698