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

chrome/browser/chromeos/login/login_utils.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/login_utils.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/lock.h"
 #include "base/nss_util.h"
@@ skipping 70 matching lines @@
                              const std::string& credentials);
 
   // Invoked after the tmpfs is successfully mounted.
   // Launches a browser in the off the record (incognito) mode.
   virtual void CompleteOffTheRecordLogin();
 
   // Creates and returns the authenticator to use. The caller owns the returned
   // Authenticator and must delete it when done.
   virtual Authenticator* CreateAuthenticator(LoginStatusConsumer* consumer);
 
-  // Used to postpone browser launch via DoBrowserLaunch() if some post
-  // login screen is to be shown.
-  virtual void EnableBrowserLaunch(bool enable);
-
-  // Returns if browser launch enabled now or not.
-  virtual bool IsBrowserLaunchEnabled() const;
-
-  // Returns auth token for 'cp' Contacts service.
-  virtual const std::string& GetAuthToken() const { return auth_token_; }
-
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
  private:
   // Attempt to connect to the preferred network if available.
   void ConnectToPreferredNetwork();
 
   NotificationRegistrar registrar_;
   bool wifi_connecting_;
   base::Time wifi_connect_start_time_;
 
-  // Indicates if DoBrowserLaunch will actually launch the browser or not.
-  bool browser_launch_enabled_;
-
-  // Auth token for Contacts service. Received by GoogleAuthenticator as
-  // part of ClientLogin response.
-  std::string auth_token_;
-
   DISALLOW_COPY_AND_ASSIGN(LoginUtilsImpl);
 };
 
 class LoginUtilsWrapper {
  public:
   LoginUtilsWrapper() {}
 
   LoginUtils* get() {
     AutoLock create(create_lock_);
     if (!ptr_.get())
@@ skipping 54 matching lines @@
   Profile* profile = profile_manager->GetDefaultProfile(user_data_dir);
 
   // Take the credentials passed in and try to exchange them for
   // full-fledged Google authentication cookies.  This is
   // best-effort; it's possible that we'll fail due to network
   // troubles or some such.  Either way, |cf| will call
   // DoBrowserLaunch on the UI thread when it's done, and then
   // delete itself.
   CookieFetcher* cf = new CookieFetcher(profile);
   cf->AttemptFetch(credentials);
-  auth_token_ = get_auth_token(credentials);
+  std::string auth = get_auth_token(credentials);
+  if (!auth.empty())
+    new UserImageDownloader(username, auth);
 }
 
 void LoginUtilsImpl::CompleteOffTheRecordLogin() {
   LOG(INFO) << "Completing off the record login";
 
   if (CrosLibrary::Get()->EnsureLoaded())
     CrosLibrary::Get()->GetLoginLibrary()->StartSession(kIncognitoUser, "");
 
   // Incognito flag is not set by default.
   CommandLine::ForCurrentProcess()->AppendSwitch(switches::kIncognito);
 
   UserManager::Get()->OffTheRecordUserLoggedIn();
   ConnectToPreferredNetwork();
   LoginUtils::DoBrowserLaunch(
       ProfileManager::GetDefaultProfile()->GetOffTheRecordProfile());
 }
 
 Authenticator* LoginUtilsImpl::CreateAuthenticator(
     LoginStatusConsumer* consumer) {
   return new GoogleAuthenticator(consumer);
 }
 
-void LoginUtilsImpl::EnableBrowserLaunch(bool enable) {
-  browser_launch_enabled_ = enable;
-}
-
-bool LoginUtilsImpl::IsBrowserLaunchEnabled() const {
-  return browser_launch_enabled_;
-}
-
 void LoginUtilsImpl::Observe(NotificationType type,
                              const NotificationSource& source,
                              const NotificationDetails& details) {
   if (type == NotificationType::LOGIN_USER_CHANGED)
     base::OpenPersistentNSSDB();
 }
 
 void LoginUtilsImpl::ConnectToPreferredNetwork() {
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   wifi_connecting_ = cros->ConnectToPreferredNetworkIfAvailable();
@@ skipping 11 matching lines @@
 
 void LoginUtils::DoBrowserLaunch(Profile* profile) {
   // If we should wait for wifi connection, post this task with a 100ms delay.
   if (LoginUtils::Get()->ShouldWaitForWifi()) {
     ChromeThread::PostDelayedTask(
         ChromeThread::UI, FROM_HERE,
         NewRunnableFunction(&LoginUtils::DoBrowserLaunch, profile), 100);
     return;
   }
 
-  // Browser launch was disabled due to some post login screen.
-  if (!LoginUtils::Get()->IsBrowserLaunchEnabled())
-    return;
-
   LOG(INFO) << "Launching browser...";
   BrowserInit browser_init;
   int return_code;
   browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(),
                              profile,
                              std::wstring(),
                              true,
                              &return_code);
 }
 
 }  // namespace chromeos