Rollback

chrome/browser/profile_manager.h

 // Copyright (c) 2006-2008 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_PROFILE_MANAGER_H__
 #define CHROME_BROWSER_PROFILE_MANAGER_H__
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/message_loop.h"
-#include "base/non_thread_safe.h"
-#include "base/system_monitor.h"
 #include "base/values.h"
 #include "chrome/browser/profile.h"
 
 // This is a small storage class that simply represents some metadata about
 // profiles that are available in the current user data directory.
 // These are cached in local state so profiles don't need to be scanned
 // for their metadata on every launch.
 class AvailableProfile {
  public:
   AvailableProfile(const std::wstring& name,
@@ skipping 25 matching lines @@
   std::wstring directory() const { return directory_; }
 
  private:
   std::wstring name_;       // User-visible profile name
   std::wstring id_;         // Profile identifier
   std::wstring directory_;  // Subdirectory containing profile (not full path)
 
   DISALLOW_EVIL_CONSTRUCTORS(AvailableProfile);
 };
 
-class ProfileManager : public NonThreadSafe,
-                       public base::SystemMonitor::PowerObserver {
+class ProfileManager {
  public:
   ProfileManager();
   virtual ~ProfileManager();
 
   // ProfileManager prefs are loaded as soon as the profile is created.
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Invokes ShutdownSessionService() on all profiles.
   static void ShutdownSessionServices();
 
@@ skipping 44 matching lines @@
   const_iterator end() { return profiles_.end(); }
 
   typedef std::vector<AvailableProfile*> AvailableProfileVector;
   const AvailableProfileVector& available_profiles() const {
     return available_profiles_;
   }
 
   // Creates a new window with the given profile.
   void NewWindowWithProfile(Profile* profile);
 
-  // PowerObserver notifications
-  void OnPowerStateChange(base::SystemMonitor*) {}
-  void OnSuspend(base::SystemMonitor*);
-  void OnResume(base::SystemMonitor*);
-
   // ------------------ static utility functions -------------------
 
   // Returns the path to the profile directory based on the user data directory.
   static std::wstring GetDefaultProfileDir(const std::wstring& user_data_dir);
 
   // Returns the path to the profile given the user profile directory.
   static std::wstring GetDefaultProfilePath(const std::wstring& profile_dir);
 
   // Tries to determine whether the given path represents a profile
   // directory, and returns true if it thinks it does.
@@ skipping 15 matching lines @@
                                 const std::wstring& id);
 
   // Returns the canonical form of the given ID string.
   static std::wstring CanonicalizeID(const std::wstring& id);
 
  private:
   // Returns the AvailableProfile entry associated with the given ID,
   // or NULL if no match is found.
   AvailableProfile* GetAvailableProfileByID(const std::wstring& id);
 
-  // Hooks to suspend/resume per-profile network traffic.
-  // These must be called on the IO thread.
-  static void SuspendProfile(Profile*);
-  static void ResumeProfile(Profile*);
-
   // We keep a simple vector of profiles rather than something fancier
   // because we expect there to be a small number of profiles active.
   ProfileVector profiles_;
 
   AvailableProfileVector available_profiles_;
 
   DISALLOW_EVIL_CONSTRUCTORS(ProfileManager);
 };
 
 #endif  // CHROME_BROWSER_PROFILE_MANAGER_H__