| Index: chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.cc
|
| index e1234fe55786ea3acc62aaba6226e0ea26f827a3..1184a2972d45b48e59a1ce1ad7b45ef50359dda7 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.cc
|
| @@ -59,7 +59,16 @@ void EnableDebuggingScreenHandler::ShowWithParams() {
|
| weak_ptr_factory_.GetWeakPtr()));
|
| }
|
|
|
| -void EnableDebuggingScreenHandler::Show() {
|
| +void EnableDebuggingScreenHandler::SetDelegate(Delegate* delegate) {
|
| + delegate_ = delegate;
|
| + if (page_is_ready())
|
| + Initialize();
|
| +}
|
| +
|
| +void EnableDebuggingScreenHandler::Show(OobeScreen screen) {
|
| + if (screen != kScreenId)
|
| + return;
|
| +
|
| if (!page_is_ready()) {
|
| show_on_init_ = true;
|
| return;
|
| @@ -68,14 +77,11 @@ void EnableDebuggingScreenHandler::Show() {
|
| ShowWithParams();
|
| }
|
|
|
| -void EnableDebuggingScreenHandler::Hide() {
|
| - weak_ptr_factory_.InvalidateWeakPtrs();
|
| -}
|
| +void EnableDebuggingScreenHandler::Hide(OobeScreen screen) {
|
| + if (screen != kScreenId)
|
| + return;
|
|
|
| -void EnableDebuggingScreenHandler::SetDelegate(Delegate* delegate) {
|
| - delegate_ = delegate;
|
| - if (page_is_ready())
|
| - Initialize();
|
| + weak_ptr_factory_.InvalidateWeakPtrs();
|
| }
|
|
|
| void EnableDebuggingScreenHandler::DeclareLocalizedValues(
|
| @@ -127,7 +133,7 @@ void EnableDebuggingScreenHandler::Initialize() {
|
| return;
|
|
|
| if (show_on_init_) {
|
| - Show();
|
| + Show(kScreenId);
|
| show_on_init_ = false;
|
| }
|
| }
|
| @@ -147,12 +153,12 @@ void EnableDebuggingScreenHandler::RegisterMessages() {
|
|
|
| void EnableDebuggingScreenHandler::HandleOnCancel() {
|
| if (delegate_)
|
| - delegate_->OnExit(false);
|
| + delegate_->OnEnableDebuggingScreenViewExit(false);
|
| }
|
|
|
| void EnableDebuggingScreenHandler::HandleOnDone() {
|
| if (delegate_)
|
| - delegate_->OnExit(true);
|
| + delegate_->OnEnableDebuggingScreenViewExit(true);
|
| }
|
|
|
| void EnableDebuggingScreenHandler::HandleOnRemoveRootFSProtection() {
|
|
|