EULA screen implemented....

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>
 
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/logging.h"  // For NOTREACHED.
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/login_library.h"
 #include "chrome/browser/chromeos/cros/system_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/login/account_screen.h"
 #include "chrome/browser/chromeos/login/background_view.h"
+#include "chrome/browser/chromeos/login/eula_view.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/language_switch_menu.h"
 #include "chrome/browser/chromeos/login/login_screen.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/network_screen.h"
 #include "chrome/browser/chromeos/login/registration_screen.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/update_screen.h"
 #include "chrome/browser/chromeos/login/user_image_screen.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "third_party/cros/chromeos_wm_ipc_enums.h"
+#include "unicode/timezone.h"
 #include "views/accelerator.h"
 #include "views/painter.h"
 #include "views/view.h"
 #include "views/widget/widget_gtk.h"
-#include "unicode/timezone.h"
 
 namespace {
 
 // A boolean pref of the OOBE complete flag.
 const wchar_t kOobeComplete[] = L"OobeComplete";
 
 // Default size of the OOBE screen.
 const int kWizardScreenWidth = 700;
 const int kWizardScreenHeight = 416;
 
 // RootView of the Widget WizardController creates. Contains the contents of the
 // WizardController.
 class ContentView : public views::View {
  public:
   ContentView(int window_x, int window_y, int screen_w, int screen_h)
       : window_x_(window_x),
         window_y_(window_y),
         screen_w_(screen_w),
         screen_h_(screen_h),
         accel_account_screen_(views::Accelerator(base::VKEY_A,
                                                  false, true, true)),
         accel_login_screen_(views::Accelerator(base::VKEY_L,
                                                false, true, true)),
         accel_network_screen_(views::Accelerator(base::VKEY_N,
                                                  false, true, true)),
         accel_update_screen_(views::Accelerator(base::VKEY_U,
                                                 false, true, true)),
         accel_image_screen_(views::Accelerator(base::VKEY_I,
+                                               false, true, true)),
+        accel_eula_screen_(views::Accelerator(base::VKEY_E,
                                                 false, true, true)) {
     AddAccelerator(accel_account_screen_);
     AddAccelerator(accel_login_screen_);
     AddAccelerator(accel_network_screen_);
     AddAccelerator(accel_update_screen_);
     AddAccelerator(accel_image_screen_);
+    AddAccelerator(accel_eula_screen_);
   }
 
   ~ContentView() {
     NotificationService::current()->Notify(
         NotificationType::WIZARD_CONTENT_VIEW_DESTROYED,
         NotificationService::AllSources(),
         NotificationService::NoDetails());
   }
 
   bool AcceleratorPressed(const views::Accelerator& accel) {
     WizardController* controller = WizardController::default_controller();
     if (!controller)
       return false;
 
     if (accel == accel_account_screen_) {
       controller->ShowAccountScreen();
     } else if (accel == accel_login_screen_) {
       controller->ShowLoginScreen();
     } else if (accel == accel_network_screen_) {
       controller->ShowNetworkScreen();
     } else if (accel == accel_update_screen_) {
       controller->ShowUpdateScreen();
     } else if (accel == accel_image_screen_) {
       controller->ShowUserImageScreen();
+    } else if (accel == accel_eula_screen_) {
+      controller->ShowEulaScreen();
     } else {
       return false;
     }
 
     return true;
   }
 
   void PaintBackground(gfx::Canvas* canvas) {
     if (painter_.get()) {
       // TODO(sky): nuke this once new login manager is in place. This needs to
@@ skipping 18 matching lines @@
   const int window_x_;
   const int window_y_;
   const int screen_w_;
   const int screen_h_;
 
   views::Accelerator accel_account_screen_;
   views::Accelerator accel_login_screen_;
   views::Accelerator accel_network_screen_;
   views::Accelerator accel_update_screen_;
   views::Accelerator accel_image_screen_;
+  views::Accelerator accel_eula_screen_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentView);
 };
 
 void DeleteWizardControllerAndLaunchBrowser(WizardController* controller) {
   delete controller;
   // Launch browser after controller is deleted and its windows are closed.
   chromeos::LoginUtils::Get()->EnableBrowserLaunch(true);
   ChromeThread::PostTask(
       ChromeThread::UI,
       FROM_HERE,
       NewRunnableFunction(&chromeos::LoginUtils::DoBrowserLaunch,
                           ProfileManager::GetDefaultProfile()));
 }
 
 }  // namespace
 
 const char WizardController::kNetworkScreenName[] = "network";
 const char WizardController::kLoginScreenName[] = "login";
 const char WizardController::kAccountScreenName[] = "account";
 const char WizardController::kUpdateScreenName[] = "update";
 const char WizardController::kUserImageScreenName[] = "image";
+const char WizardController::kEulaScreenName[] = "eula";
 const char WizardController::kRegistrationScreenName[] = "register";
 
 // Passing this parameter as a "first screen" initiates full OOBE flow.
 const char WizardController::kOutOfBoxScreenName[] = "oobe";
 
 // Special test value that commands not to create any window yet.
 const char WizardController::kTestNoScreenName[] = "test:nowindow";
 
 // Initialize default controller.
 // static
@@ skipping 112 matching lines @@
     update_screen_.reset(new chromeos::UpdateScreen(this));
   return update_screen_.get();
 }
 
 chromeos::UserImageScreen* WizardController::GetUserImageScreen() {
   if (!user_image_screen_.get())
     user_image_screen_.reset(new chromeos::UserImageScreen(this));
   return user_image_screen_.get();
 }
 
+chromeos::EulaScreen* WizardController::GetEulaScreen() {
+  if (!eula_screen_.get())
+    eula_screen_.reset(new chromeos::EulaScreen(this));
+  return eula_screen_.get();
+}
+
 chromeos::RegistrationScreen* WizardController::GetRegistrationScreen() {
   if (!registration_screen_.get())
     registration_screen_.reset(new chromeos::RegistrationScreen(this));
   return registration_screen_.get();
 }
 
 void WizardController::ShowNetworkScreen() {
   SetStatusAreaVisible(false);
   SetCurrentScreen(GetNetworkScreen());
 }
@@ skipping 32 matching lines @@
 void WizardController::ShowUpdateScreen() {
   SetStatusAreaVisible(true);
   SetCurrentScreen(GetUpdateScreen());
 }
 
 void WizardController::ShowUserImageScreen() {
   SetStatusAreaVisible(true);
   SetCurrentScreen(GetUserImageScreen());
 }
 
+void WizardController::ShowEulaScreen() {
+  SetStatusAreaVisible(false);
+  SetCurrentScreen(GetEulaScreen());
+}
+
 void WizardController::ShowRegistrationScreen() {
   SetStatusAreaVisible(true);
   SetCurrentScreen(GetRegistrationScreen());
 }
 
 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 66 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();
 }
 
 void WizardController::OnUpdateErrorCheckingForUpdate() {
-  MarkOobeCompleted();
   // 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.
-  ShowLoginScreen();
+  ShowEulaScreen();
 }
 
 void WizardController::OnUpdateErrorUpdating() {
   // If there was an error while getting or applying the update,
   // return to network selection screen.
   // TODO(nkostylev): Show message to the user explaining update error.
   // TODO(nkostylev): Update should be required during OOBE.
   // Temporary fix, need to migrate to new API. http://crosbug.com/4321
-  MarkOobeCompleted();
-  ShowLoginScreen();
+  ShowEulaScreen();
 }
 
 void WizardController::OnUserImageSelected() {
   // We're on the stack, so don't try and delete us now.
   // We should launch browser only after we delete the controller and close
   // its windows.
   ChromeThread::PostTask(
       ChromeThread::UI,
       FROM_HERE,
       NewRunnableFunction(&DeleteWizardControllerAndLaunchBrowser,
@@ skipping 34 matching lines @@
     // This flag is passed if we're running under automation test.
     is_test_mode_ = true;
     ShowLoginScreen();
   } 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();
   } else if (first_screen_name != kTestNoScreenName) {
     if (is_out_of_box_) {
       ShowNetworkScreen();
     } else {
       ShowLoginScreen();
     }
   }
 }
@@ skipping 42 matching lines @@
       break;
     case UPDATE_ERROR_UPDATING:
       OnUpdateErrorUpdating();
       break;
     case USER_IMAGE_SELECTED:
       OnUserImageSelected();
       break;
     case USER_IMAGE_SKIPPED:
       OnUserImageSkipped();
       break;
+    case EULA_ACCEPTED:
+      OnEulaAccepted();
+      break;
     default:
       NOTREACHED();
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, WizardScreen overrides:
 views::View* WizardController::GetWizardView() {
   return contents_;
 }
@@ skipping 79 matching lines @@
   if (!oobe_complete)
     controller->SetCustomization(customization.release());
   controller->ShowBackground(screen_bounds);
   controller->Init(first_screen_name, screen_bounds);
   controller->Show();
   if (chromeos::CrosLibrary::Get()->EnsureLoaded())
     chromeos::CrosLibrary::Get()->GetLoginLibrary()->EmitLoginPromptReady();
 }
 
 }  // namespace browser