cros: WIP patch to remove EnableDebuggingScreenView

chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.cc

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/values.h"
@@ skipping 41 matching lines @@
   DVLOG(1) << "Showing enable debugging screen.";
 
   // Wait for cryptohomed before checking debugd. See http://crbug.com/440506.
   chromeos::CryptohomeClient* client =
       chromeos::DBusThreadManager::Get()->GetCryptohomeClient();
   client->WaitForServiceToBeAvailable(base::Bind(
       &EnableDebuggingScreenHandler::OnCryptohomeDaemonAvailabilityChecked,
       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;
   }
 
   ShowWithParams();
 }
 
-void EnableDebuggingScreenHandler::Hide() {
+void EnableDebuggingScreenHandler::Hide(OobeScreen screen) {
+  if (screen != kScreenId)
+    return;
+
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
-void EnableDebuggingScreenHandler::SetDelegate(Delegate* delegate) {
-  delegate_ = delegate;
-  if (page_is_ready())
-    Initialize();
-}
-
 void EnableDebuggingScreenHandler::DeclareLocalizedValues(
     ::login::LocalizedValuesBuilder* builder) {
   builder->Add("enableDebuggingScreenTitle",
                IDS_ENABLE_DEBUGGING_SCREEN_TITLE);
   builder->Add("enableDebuggingScreenAccessibleTitle",
                IDS_ENABLE_DEBUGGING_SCREEN_TITLE);
   builder->Add("enableDebuggingCancelButton", IDS_CANCEL);
   builder->Add("enableDebuggingOKButton", IDS_OK);
   builder->Add("enableDebuggingRemoveButton",
                IDS_ENABLE_DEBUGGING_REMOVE_ROOTFS_BUTTON);
@@ skipping 29 matching lines @@
 // static
 void EnableDebuggingScreenHandler::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(prefs::kDebuggingFeaturesRequested, false);
 }
 
 void EnableDebuggingScreenHandler::Initialize() {
   if (!page_is_ready() || !delegate_)
     return;
 
   if (show_on_init_) {
-    Show();
+    Show(kScreenId);
     show_on_init_ = false;
   }
 }
 
 void EnableDebuggingScreenHandler::RegisterMessages() {
   AddCallback("enableDebuggingOnCancel",
               &EnableDebuggingScreenHandler::HandleOnCancel);
   AddCallback("enableDebuggingOnDone",
               &EnableDebuggingScreenHandler::HandleOnDone);
   AddCallback("enableDebuggingOnLearnMore",
               &EnableDebuggingScreenHandler::HandleOnLearnMore);
   AddCallback("enableDebuggingOnRemoveRootFSProtection",
               &EnableDebuggingScreenHandler::HandleOnRemoveRootFSProtection);
   AddCallback("enableDebuggingOnSetup",
               &EnableDebuggingScreenHandler::HandleOnSetup);
 }
 
 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() {
   UpdateUIState(UI_STATE_WAIT);
   chromeos::DebugDaemonClient* client =
       chromeos::DBusThreadManager::Get()->GetDebugDaemonClient();
   client->RemoveRootfsVerification(
       base::Bind(&EnableDebuggingScreenHandler::OnRemoveRootfsVerification,
                  weak_ptr_factory_.GetWeakPtr()));
 }
@@ skipping 116 matching lines @@
   LoginWebDialog* dialog = new LoginWebDialog(
       Profile::FromWebUI(web_ui()),
       NULL,
       GetNativeWindow(),
       base::string16(),
       data_url);
   dialog->Show();
 }
 
 }  // namespace chromeos