Merge 115621 - Refactor ProfileInfoCacheObserver interface and usage thereof.

chrome/browser/background/background_mode_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.
 
 #ifndef CHROME_BROWSER_BACKGROUND_BACKGROUND_MODE_MANAGER_H_
 #define CHROME_BROWSER_BACKGROUND_BACKGROUND_MODE_MANAGER_H_
 #pragma once
 
 #include <map>
 
@@ skipping 145 matching lines @@
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // BackgroundApplicationListModel::Observer implementation.
   virtual void OnApplicationDataChanged(const Extension* extension,
                                         Profile* profile) OVERRIDE;
   virtual void OnApplicationListChanged(Profile* profile) OVERRIDE;
 
   // Overrides from ProfileInfoCacheObserver
-  virtual void OnProfileAdded(const string16& profile_name,
-                              const string16& profile_base_dir,
-                              const FilePath& profile_path,
-                              const gfx::Image* avatar_image) OVERRIDE;
-  virtual void OnProfileWillBeRemoved(const string16& profile_name) OVERRIDE;
-  virtual void OnProfileWasRemoved(const string16& profile_name) OVERRIDE;
-  virtual void OnProfileNameChanged(const string16& old_profile_name,
-                                    const string16& new_profile_name) OVERRIDE;
-  virtual void OnProfileAvatarChanged(const string16& profile_name,
-                                      const string16& profile_base_dir,
-                                      const FilePath& profile_path,
-                                      const gfx::Image* avatar_image) OVERRIDE;
+  virtual void OnProfileAdded(const FilePath& profile_path) OVERRIDE;
+  virtual void OnProfileWillBeRemoved(const FilePath& profile_path) OVERRIDE;
+  virtual void OnProfileWasRemoved(const FilePath& profile_path,
+                                   const string16& profile_name) OVERRIDE;
+  virtual void OnProfileNameChanged(const FilePath& profile_path,
+                                    const string16& old_profile_name) OVERRIDE;
+  virtual void OnProfileAvatarChanged(const FilePath& profile_path) OVERRIDE;
 
   // Overrides from SimpleMenuModel::Delegate implementation.
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
   virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
   virtual bool GetAcceleratorForCommandId(int command_id,
                                           ui::Accelerator* accelerator)
                                           OVERRIDE;
   virtual void ExecuteCommand(int command_id) OVERRIDE;
 
   // Invoked when an extension is installed so we can ensure that
@@ skipping 110 matching lines @@
   // app).
   bool keep_alive_for_test_;
 
   // Provides a command id for each profile as they are created.
   int current_command_id_;
 
   DISALLOW_COPY_AND_ASSIGN(BackgroundModeManager);
 };
 
 #endif  // CHROME_BROWSER_BACKGROUND_BACKGROUND_MODE_MANAGER_H_