Replace ProfileManagerObserver with callback

chrome/browser/profiles/avatar_menu_model.cc

 // 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.
 
 #include "chrome/browser/profiles/avatar_menu_model.h"
 
+#include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu_model_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_init.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 
 namespace {
 
-class ProfileSwitchObserver : public ProfileManagerObserver {
- public:
-  virtual void OnProfileCreated(Profile* profile, Status status) OVERRIDE {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+void OnProfileCreated(Profile* profile,
+                      Profile::CreateStatus status) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-    if (status == STATUS_INITIALIZED) {
-      ProfileManager::NewWindowWithProfile(profile,
-                                           BrowserInit::IS_NOT_PROCESS_STARTUP,
-                                           BrowserInit::IS_NOT_FIRST_RUN);
-    }
+  if (status == Profile::CREATE_STATUS_INITIALIZED) {
+    ProfileManager::NewWindowWithProfile(profile,
+                                         BrowserInit::IS_NOT_PROCESS_STARTUP,
+                                         BrowserInit::IS_NOT_FIRST_RUN);
   }
-
-  virtual bool DeleteAfter() OVERRIDE { return true; }
-};
+}
 
 }  // namespace
 
 AvatarMenuModel::AvatarMenuModel(ProfileInfoInterface* profile_cache,
                                  AvatarMenuModelObserver* observer,
                                  Browser* browser)
     : profile_info_(profile_cache),
       observer_(observer),
       browser_(browser) {
   DCHECK(profile_info_);
@@ skipping 17 matching lines @@
       active(false),
       model_index(model_index) {
 }
 
 AvatarMenuModel::Item::~Item() {
 }
 
 void AvatarMenuModel::SwitchToProfile(size_t index) {
   const Item& item = GetItemAt(index);
   FilePath path = profile_info_->GetPathOfProfileAtIndex(item.model_index);
+  g_browser_process->profile_manager()->CreateProfileAsync(
+      path, base::Bind(&OnProfileCreated));
 
-  // This will be deleted by the manager after the profile is ready.
-  ProfileSwitchObserver* observer = new ProfileSwitchObserver();
-  g_browser_process->profile_manager()->CreateProfileAsync(
-      path, observer);
   ProfileMetrics::LogProfileSwitchUser(ProfileMetrics::SWITCH_PROFILE_ICON);
 }
 
 void AvatarMenuModel::EditProfile(size_t index) {
   Browser* browser = browser_;
   if (!browser) {
     Profile* profile = g_browser_process->profile_manager()->GetProfileByPath(
         profile_info_->GetPathOfProfileAtIndex(GetItemAt(index).model_index));
     browser = Browser::Create(profile);
   }
@@ skipping 73 matching lines @@
       item->active = browser_->profile()->GetPath() == path;
     }
     items_.push_back(item);
   }
 }
 
 void AvatarMenuModel::ClearMenu() {
   STLDeleteContainerPointers(items_.begin(), items_.end());
   items_.clear();
 }