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

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

Issue 10213003: chromeos: Break WebUILoginDisplay and SigninScreenHandler coupling on destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: for comments in #1 Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 106521af27755abdf39b2c5aaf1ecbdfe238e47c..9da9b23aef0e33fd6d5ccdb015aaaa2790c5538f 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -288,6 +288,8 @@ SigninScreenHandler::~SigninScreenHandler() {
cookie_remover_->RemoveObserver(this);
if (key_event_listener_)
key_event_listener_->RemoveCapsLockObserver(this);
+ if (delegate_)
+ delegate_->SetWebUIHandler(NULL);
CrosSettings::Get()->RemoveSettingsObserver(kAccountsPrefAllowNewUser, this);
CrosSettings::Get()->RemoveSettingsObserver(kAccountsPrefAllowGuest, this);
}
@@ -536,6 +538,10 @@ void SigninScreenHandler::ShowGaiaPasswordChanged(const std::string& username) {
"login.AccountPickerScreen.updateUserGaiaNeeded", email_value);
}
+void SigninScreenHandler::ResetSigninScreenHandlerDelegate() {
+ SetDelegate(NULL);
+}
+
void SigninScreenHandler::OnBrowsingDataRemoverDone() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
cookie_remover_ = NULL;
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698