Replace ProfileManagerObserver with callback

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
 
@@ skipping 14 matching lines @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/profiles/profile_shortcut_manager_win.h"
 #endif
 
 class NewProfileLauncher;
 class ProfileInfoCache;
 
-class ProfileManagerObserver {
- public:
-  enum Status {
-    // Asynchronous Profile services were not created.
-    STATUS_FAIL,
-    // Profile created but before initializing extensions and promo resources.
-    STATUS_CREATED,
-    // Profile is created, extensions and promo resources are initialized.
-    STATUS_INITIALIZED
-  };
-
-  // This method is called when profile is ready. If profile already exists,
-  // method is called with pointer to that profile and STATUS_INITIALIZED.
-  // If profile creation has failed, method is called with |profile| equal to
-  // NULL and |status| equal to STATUS_FAIL. If profile has been created
-  // successfully, method is called twice: first with STATUS_CREATED status
-  // (before extensions are initialized) and eventually with STATUS_INITIALIZED.
-  virtual void OnProfileCreated(Profile* profile, Status status) = 0;
-
-  // If true, delete the observer after no more OnProfileCreated calls are
-  // expected. Default is false.
-  virtual bool DeleteAfter();
-
-  virtual ~ProfileManagerObserver() {}
-};
-
 class ProfileManager : public base::NonThreadSafe,
                        public BrowserList::Observer,
                        public content::NotificationObserver,
                        public Profile::Delegate {
  public:
+  typedef base::Callback<void(Profile*, Profile::CreateStatus)> CreateCallback;
+
   explicit ProfileManager(const FilePath& user_data_dir);
   virtual ~ProfileManager();
 
   // Invokes SessionServiceFactory::ShutdownForProfile() for all profiles.
   static void ShutdownSessionServices();
 
   // Physically remove deleted profile directories from disk.
   static void NukeDeletedProfilesFromDisk();
 
   // DEPRECATED: DO NOT USE unless in ChromeOS.
   // Returns the default profile.  This adds the profile to the
   // ProfileManager if it doesn't already exist.  This method returns NULL if
   // the profile doesn't exist and we can't create it.
   // The profile used can be overridden by using --login-profile on cros.
   Profile* GetDefaultProfile(const FilePath& user_data_dir);
 
   // DEPRECATED: DO NOT USE unless in ChromeOS.
   // Same as instance method but provides the default user_data_dir as well.
   static Profile* GetDefaultProfile();
 
   // Returns a profile for a specific profile directory within the user data
   // dir. This will return an existing profile it had already been created,
   // otherwise it will create and manage it.
   Profile* GetProfile(const FilePath& profile_dir);
 
   // Returns total number of profiles available on this machine.
   size_t GetNumberOfProfiles();
 
-  // Explicit asynchronous creation of the profile. |observer| is called
-  // when profile is created. If profile has already been created, observer
-  // is called immediately. Should be called on the UI thread.
-  void CreateProfileAsync(const FilePath& user_data_dir,
-                          ProfileManagerObserver* observer);
+  // Explicit asynchronous creation of a profile located at |profile_path|.
+  // If the profile has already been created then callback is called
+  // immediately.
+  void CreateProfileAsync(const FilePath& profile_path,
+                          CreateCallback callback);

[Robert Sesek, 2011/12/07 16:36:13]

const ref

[sail, 2011/12/07 17:18:13]

Done.

 
   // Initiates default profile creation. If default profile has already been
-  // created, observer is called immediately. Should be called on the UI thread.
-  static void CreateDefaultProfileAsync(ProfileManagerObserver* observer);
+  // created then the callback is called immediately. Should be called on the
+  // UI thread.
+  static void CreateDefaultProfileAsync(CreateCallback callback);

[Robert Sesek, 2011/12/07 16:36:13]

const ref

[sail, 2011/12/07 17:18:13]

Done.

 
   // Returns true if the profile pointer is known to point to an existing
   // profile.
   bool IsValidProfile(Profile* profile);
 
   // Returns the directory where the first created profile is stored,
   // relative to the user data directory currently in use..
   FilePath GetInitialProfileDir();
 
   // Get the Profile last used with this Chrome build. If no signed profile has
@@ skipping 115 matching lines @@
   struct ProfileInfo {
     ProfileInfo(Profile* profile, bool created)
         : profile(profile), created(created) {
     }
 
     ~ProfileInfo() {}
 
     scoped_ptr<Profile> profile;
     // Whether profile has been fully loaded (created and initialized).
     bool created;
-    // List of observers which should be notified when profile initialization is
+    // List of callbacks which should be notified when profile initialization is
     // done. Note, when profile is fully loaded this vector will be empty.
-    std::vector<ProfileManagerObserver*> observers;
+    std::vector<CreateCallback> callbacks;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(ProfileInfo);
   };
 
   // Adds a pre-existing Profile object to the set managed by this
   // ProfileManager. This ProfileManager takes ownership of the Profile.
   // The Profile should not already be managed by this ProfileManager.
   // Returns true if the profile was added, false otherwise.
   bool AddProfile(Profile* profile);
@@ skipping 61 matching lines @@
 class ProfileManagerWithoutInit : public ProfileManager {
  public:
   explicit ProfileManagerWithoutInit(const FilePath& user_data_dir);
 
  protected:
   virtual void DoFinalInitForServices(Profile*, bool) OVERRIDE {}
   virtual void DoFinalInitLogging(Profile*) OVERRIDE {}
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_