Revert 90820 - Multi-Profiles: New Profile Setup UI

chrome/browser/profiles/profile_manager.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 class keeps track of the currently-active profiles in the runtime.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
 #pragma once
 
 #include <list>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 
 class FilePath;
 class NewProfileLauncher;
-class ProfileInfoCache;
 
 class ProfileManagerObserver {
  public:
   // This method is called when profile is ready. If profile creation has
   // failed, method is called with |profile| equal to NULL.
   virtual void OnProfileCreated(Profile* profile) = 0;
 
   // If true, delete the observer after the profile has been created. Default
   // is false.
   virtual bool DeleteAfterCreation();
@@ skipping 102 matching lines @@
 
   // Creates a new profile in the next available multiprofile directory.
   // Directories are named "profile_1", "profile_2", etc., in sequence of
   // creation. (Because directories can be removed, however, it may be the case
   // that at some point the list of numbered profiles is not continuous.)
   static void CreateMultiProfileAsync();
 
   // Register multi-profile related preferences in Local State.
   static void RegisterPrefs(PrefService* prefs);
 
-  // Returns a ProfileInfoCache object which can be used to get information
-  // about profiles without having to load them from disk.
-  ProfileInfoCache& GetProfileInfoCache();
-
  protected:
   // Does final initial actions.
   virtual void DoFinalInit(Profile* profile);
 
  private:
   friend class ExtensionEventRouterForwarderTest;
 
   // This struct contains information about profiles which are being loaded or
   // were loaded.
   struct ProfileInfo {
@@ skipping 37 matching lines @@
   // Indicates that a user has logged in and that the profile specified
   // in the --login-profile command line argument should be used as the
   // default.
   bool logged_in_;
 
   // Maps profile path to ProfileInfo (if profile has been created). Use
   // RegisterProfile() to add into this map.
   typedef std::map<FilePath, linked_ptr<ProfileInfo> > ProfilesInfoMap;
   ProfilesInfoMap profiles_info_;
 
-  scoped_ptr<ProfileInfoCache> profile_info_cache_;
-
   DISALLOW_COPY_AND_ASSIGN(ProfileManager);
 };
 
 // Same as the ProfileManager, but doesn't initialize some services of the
 // profile. This one is useful in unittests.
 class ProfileManagerWithoutInit : public ProfileManager {
  protected:
   virtual void DoFinalInit(Profile*) {}
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_