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

chrome/browser/chromeos/login/wizard_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/screen_observer.h"
 #include "chrome/browser/chromeos/login/view_screen.h"
 #include "chrome/browser/chromeos/login/wizard_screen.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 class WizardContentsView;
 class WizardScreen;
 
 namespace chromeos {
 class AccountScreen;
 class BackgroundView;
 class LoginScreen;
 class NetworkScreen;
-class UserImageScreen;
 class UpdateScreen;
 class StartupCustomizationDocument;
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace views {
 class Views;
@@ skipping 33 matching lines @@
 
   // Takes ownership of the specified background widget and view.
   void OwnBackground(views::Widget* background_widget,
                      chromeos::BackgroundView* background_view);
 
   // Lazy initializers and getters for screens.
   chromeos::NetworkScreen* GetNetworkScreen();
   chromeos::LoginScreen* GetLoginScreen();
   chromeos::AccountScreen* GetAccountScreen();
   chromeos::UpdateScreen* GetUpdateScreen();
-  chromeos::UserImageScreen* GetUserImageScreen();
 
   // Show specific screen.
   void ShowNetworkScreen();
   void ShowLoginScreen();
   void ShowAccountScreen();
   void ShowUpdateScreen();
-  void ShowUserImageScreen();
 
   // Returns a pointer to the current screen or NULL if there's no such
   // screen.
   WizardScreen* current_screen() const { return current_screen_; }
 
   // Overrides observer for testing.
   void set_observer(ScreenObserver* observer) { observer_ = observer; }
 
   // Sets partner startup customization. WizardController takes ownership
   // of the document object.
   void SetCustomization(
       const chromeos::StartupCustomizationDocument* customization);
 
   static const char kNetworkScreenName[];
   static const char kLoginScreenName[];
   static const char kAccountScreenName[];
   static const char kUpdateScreenName[];
-  static const char kUserImageScreenName[];
   static const char kOutOfBoxScreenName[];
   static const char kTestNoScreenName[];
 
  private:
   // Exit handlers:
   void OnLoginSignInSelected();
   void OnLoginCreateAccount();
   void OnNetworkConnected();
   void OnNetworkOffline();
   void OnAccountCreateBack();
   void OnAccountCreated();
   void OnConnectionFailed();
   void OnUpdateCompleted();
   void OnUpdateErrorCheckingForUpdate();
   void OnUpdateErrorUpdating();
-  void OnUserImageSelected();
-  void OnUserImageSkipped();
 
   // Switches from one screen to another.
   void SetCurrentScreen(WizardScreen* screen);
 
   // Changes status area visibility.
   void SetStatusAreaVisible(bool visible);
 
   // Overridden from chromeos::ScreenObserver:
   virtual void OnExit(ExitCodes exit_code);
   virtual void OnSetUserNamePassword(const std::string& username,
@@ skipping 15 matching lines @@
   chromeos::BackgroundView* background_view_;
 
   // Contents view.
   views::View* contents_;
 
   // Screens.
   scoped_ptr<chromeos::NetworkScreen> network_screen_;
   scoped_ptr<chromeos::LoginScreen> login_screen_;
   scoped_ptr<chromeos::AccountScreen> account_screen_;
   scoped_ptr<chromeos::UpdateScreen> update_screen_;
-  scoped_ptr<chromeos::UserImageScreen> user_image_screen_;
 
   // Screen that's currently active.
   WizardScreen* current_screen_;
 
   std::string username_;
   std::string password_;
 
   // True if full OOBE flow should be shown.
   bool is_out_of_box_;
 
@@ skipping 13 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest,
                            ControlFlowLanguageOnNetwork);
   FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, ControlFlowMain);
   FRIEND_TEST_ALL_PREFIXES(WizardControllerTest, SwitchLanguage);
   friend class WizardControllerFlowTest;
 
   DISALLOW_COPY_AND_ASSIGN(WizardController);
 };
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_