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

chrome/browser/chromeos/login/helper.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.
 //
 // This file contains helper functions used by Chromium OS login.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_HELPER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_HELPER_H_
 #pragma once
 
@@ skipping 15 matching lines @@
 class MenuButton;
 class Painter;
 class SmoothedThrobber;
 class Textfield;
 class Throbber;
 class Widget;
 }  // namespace views
 
 namespace chromeos {
 
-class StartupCustomizationDocument;
 class NetworkLibrary;
 
 // View that provides interface for start/stop throbber above the view.
 class ThrobberHostView : public views::View {
  public:
   ThrobberHostView();
   virtual ~ThrobberHostView();
 
   // Creates throbber above the view in the right side with the default
   // margin. Also places throbber in the middle of the vertical host size.
@@ skipping 55 matching lines @@
 // Returns URL used for account recovery.
 GURL GetAccountRecoveryHelpUrl();
 
 // Returns name of the currently connected network.
 // If there are no connected networks, returns name of the network
 // that is in the "connecting" state. Otherwise empty string is returned.
 // If there are multiple connected networks, network priority:
 // Ethernet > WiFi > Cellular. Same for connecting network.
 string16 GetCurrentNetworkName(NetworkLibrary* network_library);
 
-// Load OEM partner startup customization manifest
-// containing locale, timezone, EULA, etc.
-const chromeos::StartupCustomizationDocument* LoadStartupManifest();
-
 // Define the constants in |login| namespace to avoid potential
 // conflict with other chromeos components.
 namespace login {
 
 // Command tag for buttons on the lock screen.
 enum Command {
   SIGN_OUT,
 };
 
 // Gap between edge and image view, and image view and controls.
@@ skipping 65 matching lines @@
 
 // New pod sizes.
 const int kNewUserPodFullWidth = 372;
 const int kNewUserPodFullHeight = 372;
 const int kNewUserPodSmallWidth = 360;
 const int kNewUserPodSmallHeight = 322;
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_HELPER_H_