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

chrome/browser/chromeos/login/base_login_display_host.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_BASE_LOGIN_DISPLAY_HOST_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_BASE_LOGIN_DISPLAY_HOST_H_
 #pragma once
 
 #include <string>
 
@@ skipping 24 matching lines @@
 
   // Returns the default LoginDispalyHost instance if it has been created.
   static LoginDisplayHost* default_host() {
     return default_host_;
   }
 
   // LoginDisplayHost implementation:
   virtual void OnSessionStart();
   virtual void StartWizard(
       const std::string& first_screen_name,
-      const chromeos::StartupCustomizationDocument* manifest,
       const GURL& start_url);
   virtual void StartSignInScreen();
 
   const gfx::Rect& background_bounds() const { return background_bounds_; }
 
  private:
   // NotificationObserver implementation:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
@@ skipping 11 matching lines @@
 
   // OOBE and some screens (camera, recovery) controller.
   scoped_ptr<WizardController> wizard_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseLoginDisplayHost);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_BASE_LOGIN_DISPLAY_HOST_H_