Revert r48735 "Added user image screen for new user login (or old user logging in through"

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/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/login_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/login/account_screen.h"
 #include "chrome/browser/chromeos/login/background_view.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.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/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/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 "views/accelerator.h"
 #include "views/painter.h"
 #include "views/screen.h"
 #include "views/view.h"
 #include "views/widget/widget_gtk.h"
 
 namespace {
@@ skipping 11 matching lines @@
         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)) {
     if (paint_background) {
       painter_.reset(chromeos::CreateWizardPainter(
                          &chromeos::BorderDefinition::kWizardBorder));
     }
 
     AddAccelerator(accel_account_screen_);
     AddAccelerator(accel_login_screen_);
     AddAccelerator(accel_network_screen_);
     AddAccelerator(accel_update_screen_);
-    AddAccelerator(accel_image_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 {
       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 17 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_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentView);
 };
 
 
 // Returns bounds of the screen to use for login wizard.
 // The rect is centered within the default monitor and sized accordingly if
 // |size| is not empty. Otherwise the whole monitor is occupied.
 gfx::Rect CalculateScreenBounds(const gfx::Size& size) {
   gfx::Rect bounds(views::Screen::GetMonitorWorkAreaNearestWindow(NULL));
   if (!size.IsEmpty()) {
     int horizontal_diff = bounds.width() - size.width();
     int vertical_diff = bounds.height() - size.height();
     bounds.Inset(horizontal_diff / 2, vertical_diff / 2);
   }
 
   return bounds;
 }
 
 }  // 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";
 
 // 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
 WizardController* WizardController::default_controller_ = NULL;
@@ skipping 14 matching lines @@
 }
 
 WizardController::~WizardController() {
   // Close ends up deleting the widget.
   if (background_widget_)
     background_widget_->Close();
 
   if (widget_)
     widget_->Close();
 
-  // Complete login.
-  chromeos::LoginUtils::Get()->EnableBrowserLaunch(true);
-  ChromeThread::PostTask(
-      ChromeThread::UI,
-      FROM_HERE,
-      NewRunnableFunction(&chromeos::LoginUtils::DoBrowserLaunch,
-                          ProfileManager::GetDefaultProfile()));
-
   default_controller_ = NULL;
 }
 
 void WizardController::Init(const std::string& first_screen_name,
                             const gfx::Rect& screen_bounds,
                             bool paint_background) {
   DCHECK(!contents_);
 
   int offset_x = (screen_bounds.width() - kWizardScreenWidth) / 2;
   int offset_y = (screen_bounds.height() - kWizardScreenHeight) / 2;
   int window_x = screen_bounds.x() + offset_x;
   int window_y = screen_bounds.y() + offset_y;
 
   contents_ = new ContentView(paint_background,
                               offset_x, offset_y,
                               screen_bounds.width(), screen_bounds.height());
 
   views::WidgetGtk* window =
       new views::WidgetGtk(views::WidgetGtk::TYPE_WINDOW);
   widget_ = window;
-  if (!paint_background) {
+  if (!paint_background)
     window->MakeTransparent();
-    // Window transparency makes background flicker through controls that
-    // are constantly updating its contents (like image view with video
-    // stream). Hence enabling double buffer.
-    window->EnableDoubleBuffer(true);
-  }
   window->Init(NULL, gfx::Rect(window_x, window_y, kWizardScreenWidth,
                                kWizardScreenHeight));
   chromeos::WmIpc::instance()->SetWindowType(
       window->GetNativeView(),
       chromeos::WM_IPC_WINDOW_LOGIN_GUEST,
       NULL);
   window->SetContentsView(contents_);
 
   if (chromeos::UserManager::Get()->GetUsers().empty() ||
       first_screen_name == kOutOfBoxScreenName) {
@@ skipping 45 matching lines @@
     account_screen_.reset(new chromeos::AccountScreen(this));
   return account_screen_.get();
 }
 
 chromeos::UpdateScreen* WizardController::GetUpdateScreen() {
   if (!update_screen_.get())
     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();
-}
-
 void WizardController::ShowNetworkScreen() {
   SetStatusAreaVisible(false);
   SetCurrentScreen(GetNetworkScreen());
 }
 
 void WizardController::ShowLoginScreen() {
   SetStatusAreaVisible(true);
   SetCurrentScreen(GetLoginScreen());
 }
 
 void WizardController::ShowAccountScreen() {
   SetStatusAreaVisible(true);
   SetCurrentScreen(GetAccountScreen());
 }
 
 void WizardController::ShowUpdateScreen() {
   SetStatusAreaVisible(true);
   SetCurrentScreen(GetUpdateScreen());
 }
 
-void WizardController::ShowUserImageScreen() {
-  SetStatusAreaVisible(true);
-  SetCurrentScreen(GetUserImageScreen());
-}
-
 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);
   }
 }
 
 void WizardController::SetCustomization(
     const chromeos::StartupCustomizationDocument* customization) {
   customization_.reset(customization);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, ExitHandlers:
 void WizardController::OnLoginSignInSelected() {
-  // Don't launch browser until we pass image screen.
-  chromeos::LoginUtils::Get()->EnableBrowserLaunch(false);
-  ShowUserImageScreen();
+  // 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_) {
     ShowUpdateScreen();
     GetUpdateScreen()->StartUpdate();
@@ skipping 45 matching lines @@
   ShowLoginScreen();
 }
 
 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.
   ShowNetworkScreen();
 }
 
-void WizardController::OnUserImageSelected() {
-  // We're on the stack, so don't try and delete us now.
-  MessageLoop::current()->DeleteSoon(FROM_HERE, this);
-  // TODO(avayvod): Sync image with Google Sync.
-}
-
-void WizardController::OnUserImageSkipped() {
-  OnUserImageSelected();
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // 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 12 matching lines @@
 void WizardController::ShowFirstScreen(const std::string& first_screen_name) {
   if (first_screen_name == kNetworkScreenName) {
     ShowNetworkScreen();
   } else if (first_screen_name == kLoginScreenName) {
     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 != kTestNoScreenName) {
     if (is_out_of_box_) {
       ShowNetworkScreen();
     } else {
       ShowLoginScreen();
     }
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 25 matching lines @@
     case UPDATE_INSTALLED:
     case UPDATE_NOUPDATE:
       OnUpdateCompleted();
       break;
     case UPDATE_ERROR_CHECKING_FOR_UPDATE:
       OnUpdateErrorCheckingForUpdate();
       break;
     case UPDATE_ERROR_UPDATING:
       OnUpdateErrorUpdating();
       break;
-    case USER_IMAGE_SELECTED:
-      OnUserImageSelected();
-      break;
-    case USER_IMAGE_SKIPPED:
-      OnUserImageSkipped();
-      break;
     default:
       NOTREACHED();
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, WizardScreen overrides:
 views::View* WizardController::GetWizardView() {
   return contents_;
 }
@@ skipping 43 matching lines @@
   WizardController* controller = new WizardController();
   controller->SetCustomization(customization.release());
   controller->ShowBackground(screen_bounds);
   controller->Init(first_screen_name, screen_bounds, true);
   controller->Show();
   if (chromeos::CrosLibrary::Get()->EnsureLoaded())
     chromeos::CrosLibrary::Get()->GetLoginLibrary()->EmitLoginPromptReady();
 }
 
 }  // namespace browser