From 878b290459100863f0473b466c64eebe04af4b45 Mon Sep 17 00:00:00 2001 From: "bauerb@chromium.org" Date: Thu, 26 Sep 2013 05:08:30 +0000 Subject: [PATCH] Notify delegate when LocallyManagedUserCreationScreenHandler is destroyed. Also, remove the unused OnExit() method. BUG=294480 Review URL: https://codereview.chromium.org/23830012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225340 0039d316-1c4b-4281-b951-d872f2087c98 --- .../chromeos/login/managed/locally_managed_user_creation_screen.cc | 2 -- .../chromeos/login/managed/locally_managed_user_creation_screen.h | 1 - .../chromeos/login/locally_managed_user_creation_screen_handler.cc | 5 ++++- .../chromeos/login/locally_managed_user_creation_screen_handler.h | 3 --- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc index 3b82a39db616..240b5235c081 100644 --- a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc +++ b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc @@ -198,8 +198,6 @@ void LocallyManagedUserCreationScreen::OnManagerCryptohomeAuthenticated() { } } -void LocallyManagedUserCreationScreen::OnExit() {} - void LocallyManagedUserCreationScreen::OnActorDestroyed( LocallyManagedUserCreationScreenHandler* actor) { if (actor_ == actor) diff --git a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.h b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.h index addee85ac881..e1761fb0de8f 100644 --- a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.h +++ b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.h @@ -65,7 +65,6 @@ class LocallyManagedUserCreationScreen virtual std::string GetName() const OVERRIDE; // LocallyManagedUserCreationScreenHandler::Delegate implementation: - virtual void OnExit() OVERRIDE; virtual void OnActorDestroyed(LocallyManagedUserCreationScreenHandler* actor) OVERRIDE; virtual void CreateManagedUser( diff --git a/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc index 31ea3cdd7bfa..da1c73da6a43 100644 --- a/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc @@ -38,7 +38,10 @@ LocallyManagedUserCreationScreenHandler() } LocallyManagedUserCreationScreenHandler:: - ~LocallyManagedUserCreationScreenHandler() {} + ~LocallyManagedUserCreationScreenHandler() { + if (delegate_) + delegate_->OnActorDestroyed(this); +} void LocallyManagedUserCreationScreenHandler::DeclareLocalizedValues( LocalizedValuesBuilder* builder) { diff --git a/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.h index 1ec027a4b197..2fb77c9739a8 100644 --- a/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.h @@ -25,9 +25,6 @@ class LocallyManagedUserCreationScreenHandler : public BaseScreenHandler { public: virtual ~Delegate() {} - // Called when screen is exited. - virtual void OnExit() = 0; - // This method is called, when actor is being destroyed. Note, if Delegate // is destroyed earlier then it has to call SetDelegate(NULL). virtual void OnActorDestroyed( -- 2.11.4.GIT