Disable EULA/update/register screens for non-official builds.

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2010 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 <gdk/gdk.h>
 #include <signal.h>
 #include <sys/types.h>
 
@@ skipping 210 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, public:
 
 WizardController::WizardController()
     : widget_(NULL),
       background_widget_(NULL),
       background_view_(NULL),
       contents_(NULL),
       current_screen_(NULL),
+#if defined(OFFICIAL_BUILD)
+      is_official_build_(true),
+#else
+      is_official_build_(false),
+#endif
       is_out_of_box_(false),
       is_test_mode_(false),
       observer_(NULL) {
   DCHECK(default_controller_ == NULL);
   default_controller_ = this;
 }
 
 WizardController::~WizardController() {
   // Close ends up deleting the widget.
   if (background_widget_)
@@ skipping 174 matching lines @@
   LOG(INFO) << "Showing user image screen.";
   SetStatusAreaVisible(true);
   SetCurrentScreen(GetUserImageScreen());
   background_view_->SetOobeProgress(chromeos::BackgroundView::PICTURE);
 }
 
 void WizardController::ShowEulaScreen() {
   LOG(INFO) << "Showing EULA screen.";
   SetStatusAreaVisible(false);
   SetCurrentScreen(GetEulaScreen());
+#if defined(OFFICIAL_BUILD)
   background_view_->SetOobeProgress(chromeos::BackgroundView::EULA);
+#endif
 }
 
 void WizardController::ShowRegistrationScreen() {
   LOG(INFO) << "Showing registration screen.";
   SetStatusAreaVisible(true);
   SetCurrentScreen(GetRegistrationScreen());
+#if defined(OFFICIAL_BUILD)
   background_view_->SetOobeProgress(chromeos::BackgroundView::REGISTRATION);
+#endif
 }
 
 void WizardController::SetStatusAreaVisible(bool visible) {
   // When ExistingUserController passes background ownership
   // to WizardController it happens after screen is shown.
   if (background_view_) {
     background_view_->SetStatusAreaVisible(visible);
   }
 }
 
@@ skipping 28 matching lines @@
 void WizardController::OnLoginGuestUser() {
   // We're on the stack, so don't try and delete us now.
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 void WizardController::OnLoginCreateAccount() {
   ShowAccountScreen();
 }
 
 void WizardController::OnNetworkConnected() {
-  if (is_out_of_box_) {
+  if (is_official_build_) {
     ShowUpdateScreen();
     GetUpdateScreen()->StartUpdate();
   } else {
-    // TODO(nkostylev): Remove this path after accelerator is removed.
-    ShowLoginScreen();
+    OnOOBECompleted();
   }
 }
 
 void WizardController::OnNetworkOffline() {
   // TODO(dpolukhin): if(is_out_of_box_) we cannot work offline and
   // should report some error message here and stay on the same screen.
   ShowLoginScreen();
 }
 
 void WizardController::OnAccountCreateBack() {
@@ skipping 29 matching lines @@
 void WizardController::OnConnectionFailed() {
   // TODO(dpolukhin): show error message after login screen is displayed.
   ShowLoginScreen();
 }
 
 void WizardController::OnUpdateCompleted() {
   ShowEulaScreen();
 }
 
 void WizardController::OnEulaAccepted() {
-  MarkOobeCompleted();
-  ShowLoginScreen();
+  OnOOBECompleted();
 }
 
 void WizardController::OnUpdateErrorCheckingForUpdate() {
   // TODO(nkostylev): Update should be required during OOBE.
   // We do not want to block users from being able to proceed to the login
   // screen if there is any error checking for an update.
   // They could use "browse without sign-in" feature to set up the network to be
   // able to perform the update later.
   ShowEulaScreen();
 }
@@ skipping 26 matching lines @@
 void WizardController::OnRegistrationSuccess() {
   MarkDeviceRegistered();
   ShowUserImageScreen();
 }
 
 void WizardController::OnRegistrationSkipped() {
   // TODO(nkostylev): Track in a histogram?
   OnRegistrationSuccess();
 }
 
+void WizardController::OnOOBECompleted() {
+  MarkOobeCompleted();
+  ShowLoginScreen();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, private:
 
 void WizardController::SetCurrentScreen(WizardScreen* new_current) {
   if (current_screen_ == new_current)
     return;
   if (current_screen_)
     current_screen_->Hide();
   current_screen_ = new_current;
   if (current_screen_) {
@@ skipping 19 matching lines @@
   } else if (first_screen_name == kAccountScreenName) {
     ShowAccountScreen();
   } else if (first_screen_name == kUpdateScreenName) {
     ShowUpdateScreen();
     GetUpdateScreen()->StartUpdate();
   } else if (first_screen_name == kUserImageScreenName) {
     ShowUserImageScreen();
   } else if (first_screen_name == kEulaScreenName) {
     ShowEulaScreen();
   } else if (first_screen_name == kRegistrationScreenName) {
-    ShowRegistrationScreen();
+    if (is_official_build_) {
+      ShowRegistrationScreen();
+    } else {
+      // Just proceed to image screen.
+      OnRegistrationSuccess();
+    }
   } else if (first_screen_name != kTestNoScreenName) {
     if (is_out_of_box_) {
       ShowNetworkScreen();
     } else {
       ShowLoginScreen();
     }
   }
 }
 
 void WizardController::MarkOobeCompleted() {
@@ skipping 181 matching lines @@
     // user has changed to during OOBE.
     if (!timezone_name.empty()) {
       icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
           icu::UnicodeString::fromUTF8(timezone_name));
       chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone);
     }
   }
 }
 
 }  // namespace browser