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

chrome/browser/chromeos/login/existing_user_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_EXISTING_USER_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
 #pragma once
 
 #include <string>
 
@@ skipping 37 matching lines @@
  public:
   // All UI initialization is deferred till Init() call.
   explicit ExistingUserController(LoginDisplayHost* host);
   ~ExistingUserController();
 
   // Returns the current existing user controller if it has been created.
   static ExistingUserController* current_controller() {
     return current_controller_;
   }
 
-  void set_initial_start_page(const std::string& url) {
-    initial_start_page_ = url;
-  }
-
   // Creates and shows login UI for known users.
   void Init(const UserVector& users);
 
   // LoginDisplay::Delegate: implementation
   virtual void CreateAccount() OVERRIDE;
   virtual string16 GetConnectedNetworkName() OVERRIDE;
   virtual void FixCaptivePortal() OVERRIDE;
   virtual void Login(const std::string& username,
                      const std::string& password) OVERRIDE;
   virtual void LoginAsGuest() OVERRIDE;
@@ skipping 76 matching lines @@
   // Pointer to the current instance of the controller to be used by
   // automation tests.
   static ExistingUserController* current_controller_;
 
   // Triggers prefetching of user settings.
   scoped_ptr<UserCrosSettingsProvider> user_settings_;
 
   // URL to append to start Guest mode with.
   GURL guest_mode_url_;
 
-  // URL to open on first owner login from OEM customization manifest.
-  std::string initial_start_page_;
-
   // Used for user image changed notifications.
   NotificationRegistrar registrar_;
 
   // Factory of callbacks.
   ScopedRunnableMethodFactory<ExistingUserController> method_factory_;
 
   // Whether everything is ready to launch the browser.
   bool ready_for_browser_launch_;
 
   // Whether two factor credentials were used.
   bool two_factor_credentials_;
 
   // Used to verify ownership before starting enterprise enrollment.
   scoped_ptr<OwnershipStatusChecker> ownership_checker_;
 
   FRIEND_TEST_ALL_PREFIXES(ExistingUserControllerTest, NewUserLogin);
 
   DISALLOW_COPY_AND_ASSIGN(ExistingUserController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_