Added UI to enable debugging features on CrOS

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2012 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/chromeos/login/wizard_controller.h"
 
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
@@ skipping 16 matching lines @@
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/geolocation/simple_geolocation_provider.h"
 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/hwid_checker.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/screens/controller_pairing_screen.h"
 #include "chrome/browser/chromeos/login/screens/device_disabled_screen.h"
+#include "chrome/browser/chromeos/login/screens/enable_debugging_screen.h"
 #include "chrome/browser/chromeos/login/screens/error_screen.h"
 #include "chrome/browser/chromeos/login/screens/eula_screen.h"
 #include "chrome/browser/chromeos/login/screens/hid_detection_screen.h"
 #include "chrome/browser/chromeos/login/screens/host_pairing_screen.h"
 #include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h"
 #include "chrome/browser/chromeos/login/screens/kiosk_enable_screen.h"
 #include "chrome/browser/chromeos/login/screens/network_screen.h"
 #include "chrome/browser/chromeos/login/screens/reset_screen.h"
 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen.h"
 #include "chrome/browser/chromeos/login/screens/update_screen.h"
@@ skipping 96 matching lines @@
 
 }  // namespace
 
 namespace chromeos {
 
 const char WizardController::kNetworkScreenName[] = "network";
 const char WizardController::kLoginScreenName[] = "login";
 const char WizardController::kUpdateScreenName[] = "update";
 const char WizardController::kUserImageScreenName[] = "image";
 const char WizardController::kEulaScreenName[] = "eula";
+const char WizardController::kEnableDebuggingScreenName[] = "debugging";
 const char WizardController::kEnrollmentScreenName[] = "enroll";
 const char WizardController::kResetScreenName[] = "reset";
 const char WizardController::kKioskEnableScreenName[] = "kiosk-enable";
 const char WizardController::kKioskAutolaunchScreenName[] = "autolaunch";
 const char WizardController::kErrorScreenName[] = "error-message";
 const char WizardController::kTermsOfServiceScreenName[] = "tos";
 const char WizardController::kAutoEnrollmentCheckScreenName[] =
   "auto-enrollment-check";
 const char WizardController::kWrongHWIDScreenName[] = "wrong-hwid";
 const char WizardController::kSupervisedUserCreationScreenName[] =
@@ skipping 141 matching lines @@
     return new chromeos::UserImageScreen(
         this, oobe_display_->GetUserImageScreenActor());
   } else if (screen_name == kEulaScreenName) {
     return new chromeos::EulaScreen(this, oobe_display_->GetEulaScreenActor());
   } else if (screen_name == kEnrollmentScreenName) {
     return new chromeos::EnrollmentScreen(
         this, oobe_display_->GetEnrollmentScreenActor());
   } else if (screen_name == kResetScreenName) {
     return new chromeos::ResetScreen(this,
                                      oobe_display_->GetResetScreenActor());
+  } else if (screen_name == kEnableDebuggingScreenName) {
+    return new chromeos::EnableDebuggingScreen(
+        this,
+        oobe_display_->GetEnableDebuggingScreenActor());
   } else if (screen_name == kKioskEnableScreenName) {
     return new chromeos::KioskEnableScreen(
         this, oobe_display_->GetKioskEnableScreenActor());
   } else if (screen_name == kKioskAutolaunchScreenName) {
     return new chromeos::KioskAutolaunchScreen(
         this, oobe_display_->GetKioskAutolaunchScreenActor());
   } else if (screen_name == kTermsOfServiceScreenName) {
     return new chromeos::TermsOfServiceScreen(
         this, oobe_display_->GetTermsOfServiceScreenActor());
   } else if (screen_name == kWrongHWIDScreenName) {
@@ skipping 137 matching lines @@
   SetStatusAreaVisible(false);
   SetCurrentScreen(GetScreen(kKioskEnableScreenName));
 }
 
 void WizardController::ShowKioskAutolaunchScreen() {
   VLOG(1) << "Showing kiosk autolaunch screen.";
   SetStatusAreaVisible(false);
   SetCurrentScreen(GetScreen(kKioskAutolaunchScreenName));
 }
 
+void WizardController::ShowEnableDebuggingScreen() {
+  VLOG(1) << "Showing enable developer features screen.";
+  SetStatusAreaVisible(false);
+  SetCurrentScreen(GetScreen(kEnableDebuggingScreenName));
+}
+
+

[xiyuan, 2014/10/30 03:52:08]

nit: nuke one empty line.

[zel, 2014/10/31 01:22:26]

Done.

 void WizardController::ShowTermsOfServiceScreen() {
   // Only show the Terms of Service when logging into a public account and Terms
   // of Service have been specified through policy. In all other cases, advance
   // to the user image screen immediately.
   if (!user_manager::UserManager::Get()->IsLoggedInAsPublicAccount() ||
       !ProfileManager::GetActiveUserProfile()->GetPrefs()->IsManagedPreference(
           prefs::kTermsOfServiceURL)) {
     ShowUserImageScreen();
     return;
   }
@@ skipping 210 matching lines @@
     PerformOOBECompletedActions();
 
   // TODO(mnissler): Unify the logic for auto-login for Public Sessions and
   // Kiosk Apps and make this code cover both cases: http://crbug.com/234694.
   if (KioskAppManager::Get()->IsAutoLaunchEnabled())
     AutoLaunchKioskApp();
   else
     ShowLoginScreen(LoginScreenContext());
 }
 
-void WizardController::OnResetCanceled() {
+void WizardController::OnDeviceModificationCanceled() {
   if (previous_screen_) {
     SetCurrentScreen(previous_screen_);
   } else {
     ShowLoginScreen(LoginScreenContext());
   }
 }
 
 void WizardController::OnKioskAutolaunchCanceled() {
   ShowLoginScreen(LoginScreenContext());
 }
@@ skipping 169 matching lines @@
   } else if (screen_name == kUserImageScreenName) {
     ShowUserImageScreen();
   } else if (screen_name == kEulaScreenName) {
     ShowEulaScreen();
   } else if (screen_name == kResetScreenName) {
     ShowResetScreen();
   } else if (screen_name == kKioskEnableScreenName) {
     ShowKioskEnableScreen();
   } else if (screen_name == kKioskAutolaunchScreenName) {
     ShowKioskAutolaunchScreen();
+  } else if (screen_name == kEnableDebuggingScreenName) {
+    ShowEnableDebuggingScreen();
   } else if (screen_name == kEnrollmentScreenName) {
     ShowEnrollmentScreen();
   } else if (screen_name == kTermsOfServiceScreenName) {
     ShowTermsOfServiceScreen();
   } else if (screen_name == kWrongHWIDScreenName) {
     ShowWrongHWIDScreen();
   } else if (screen_name == kAutoEnrollmentCheckScreenName) {
     ShowAutoEnrollmentCheckScreen();
   } else if (screen_name == kSupervisedUserCreationScreenName) {
     ShowSupervisedUserCreationScreen();
@@ skipping 59 matching lines @@
       break;
     case USER_IMAGE_SELECTED:
       OnUserImageSelected();
       break;
     case EULA_ACCEPTED:
       OnEulaAccepted();
       break;
     case EULA_BACK:
       ShowNetworkScreen();
       break;
+    case ENABLE_DEBUGGING_CANCELED:
+      OnDeviceModificationCanceled();
+      break;
     case ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED:
       if (skip_update_enroll_after_eula_)
         ShowEnrollmentScreen();
       else
         OnAutoEnrollmentCheckCompleted();
       break;
     case ENTERPRISE_ENROLLMENT_COMPLETED:
       OnEnrollmentDone();
       break;
     case ENTERPRISE_ENROLLMENT_BACK:
       ShowNetworkScreen();
       break;
     case RESET_CANCELED:
-      OnResetCanceled();
+      OnDeviceModificationCanceled();
       break;
     case KIOSK_AUTOLAUNCH_CANCELED:
       OnKioskAutolaunchCanceled();
       break;
     case KIOSK_AUTOLAUNCH_CONFIRMED:
       OnKioskAutolaunchConfirmed();
       break;
     case KIOSK_ENABLE_COMPLETED:
       OnKioskEnableCompleted();
       break;
@@ skipping 303 matching lines @@
   if (accepted_eula) // Always true.
     StartupUtils::MarkEulaAccepted();
   SetUsageStatisticsReporting(send_reports);
   NetworkScreenActor* network_actor = oobe_display_->GetNetworkScreenActor();
   network_actor->SetApplicationLocale(lang);
   network_actor->SetTimezone(timezone);
   network_actor->SetInputMethod(keyboard_layout);
 }
 
 }  // namespace chromeos