Merge 82987, 83304 - make sure that OEM tab is shown even if first login is Guest

chrome/browser/chromeos/login/wizard_controller.h

 // Copyright (c) 2011 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_
 #pragma once
 
 #include <string>
 
@@ skipping 12 matching lines @@
 
 namespace chromeos {
 class AccountScreen;
 class EnterpriseEnrollmentScreen;
 class EulaScreen;
 class ExistingUserController;
 class HTMLPageScreen;
 class LoginDisplayHost;
 class NetworkScreen;
 class RegistrationScreen;
-class StartupCustomizationDocument;
 class UpdateScreen;
 class UserImageScreen;
 class WizardInProcessBrowserTest;
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace views {
@@ skipping 80 matching lines @@
   // 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; }
 
   // Set URL to open on browser launch.
   void set_start_url(const GURL& start_url) { start_url_ = start_url; }
 
-  // Sets partner startup customization. WizardController takes ownership
-  // of the document object.
-  void SetCustomization(
-      const chromeos::StartupCustomizationDocument* customization);
-
-  // Returns partner startup customization document owned by WizardController.
-  const chromeos::StartupCustomizationDocument* GetCustomization() const;
-
   // If being at register screen proceeds to the next one.
   void SkipRegistration();
 
   // Registers OOBE preferences.
   static void RegisterPrefs(PrefService* local_state);
 
   static const char kNetworkScreenName[];
   static const char kLoginScreenName[];
   static const char kAccountScreenName[];
   static const char kUpdateScreenName[];
@@ skipping 115 matching lines @@
 
   // OOBE/login display host.
   chromeos::LoginDisplayHost* host_;
 
   // NULL by default - controller itself is observer. Mock could be assigned.
   ScreenObserver* observer_;
 
   // Default WizardController.
   static WizardController* default_controller_;
 
-  // Partner startup customizations.
-  scoped_ptr<const chromeos::StartupCustomizationDocument> customization_;
-
   // URL to open on browser launch.
   GURL start_url_;
 
   base::OneShotTimer<WizardController> smooth_show_timer_;
 
   // State of Usage stat/error reporting checkbox on EULA screen
   // during wizard lifetime.
   bool usage_statistics_reporting_;
 
   FRIEND_TEST_ALL_PREFIXES(WizardControllerTest, SwitchLanguage);
   friend class WizardControllerFlowTest;
   friend class chromeos::WizardInProcessBrowserTest;
 
   DISALLOW_COPY_AND_ASSIGN(WizardController);
 };
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_