Committing change 255087 for Roger:...

chrome/browser/profile.h

 // Copyright (c) 2009 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 gathers state related to a single user profile.
 
 #ifndef CHROME_BROWSER_PROFILE_H_
 #define CHROME_BROWSER_PROFILE_H_
 
 #include <set>
@@ skipping 42 matching lines @@
 class TemplateURLModel;
 class ThemeProvider;
 class ThumbnailStore;
 class URLRequestContext;
 class UserScriptMaster;
 class VisitedLinkMaster;
 class VisitedLinkEventListener;
 class WebDataService;
 class WebKitContext;
 
+typedef intptr_t ProfileId;
+
 class Profile {
  public:
   // Profile services are accessed with the following parameter. This parameter
   // defines what the caller plans to do with the service.
   // The caller is responsible for not performing any operation that would
   // result in persistent implicit records while using an OffTheRecord profile.
   // This flag allows the profile to perform an additional check.
   //
   // It also gives us an opportunity to perform further checks in the future. We
   // could, for example, return an history service that only allow some specific
   // methods.
   enum ServiceAccessType {
     // The caller plans to perform a read or write that takes place as a result
     // of the user input. Use this flag when the operation you are doing can be
     // performed while off the record. (ex: creating a bookmark)
     //
     // Since EXPLICIT_ACCESS means "as a result of a user action", this request
     // always succeeds.
     EXPLICIT_ACCESS,
 
     // The caller plans to call a method that will permanently change some data
     // in the profile, as part of Chrome's implicit data logging. Use this flag
     // when you are about to perform an operation which is incompatible with the
     // off the record mode.
     IMPLICIT_ACCESS
   };
+
+  // Value that represents no profile Id.
+  static const ProfileId InvalidProfileId;
+
   Profile() : restored_last_session_(false) {}
   virtual ~Profile() {}
 
   // Profile prefs are registered as soon as the prefs are loaded for the first
   // time.
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Create a new profile given a path.
   static Profile* CreateProfile(const FilePath& path);
 
   // Returns the request context for the "default" profile.  This may be called
   // from any thread.  This CAN return NULL if a first request context has not
   // yet been created.  If necessary, listen on the UI thread for
   // NOTIFY_DEFAULT_REQUEST_CONTEXT_AVAILABLE.
   //
   // The returned object is ref'd by the profile.  Callers who AddRef() it (to
   // keep it alive longer than the profile) must Release() it on the I/O thread.
   static URLRequestContext* GetDefaultRequestContext();
 
+  // Returns a unique Id that can be used to identify this profile at runtime.
+  // This Id is not persistent and will not survive a restart of the browser.
+  virtual ProfileId GetRuntimeId() = 0;
+
   // Returns the path of the directory where this profile's data is stored.
   virtual FilePath GetPath() = 0;
 
   // Return whether this profile is off the record. Default is false.
   virtual bool IsOffTheRecord() = 0;
 
   // Return the off the record version of this profile. The returned pointer
   // is owned by the receiving profile. If the receiving profile is off the
   // record, the same profile is returned.
   virtual Profile* GetOffTheRecordProfile() = 0;
@@ skipping 246 matching lines @@
 
 class OffTheRecordProfileImpl;
 
 // The default profile implementation.
 class ProfileImpl : public Profile,
                     public NotificationObserver {
  public:
   virtual ~ProfileImpl();
 
   // Profile implementation.
+  virtual ProfileId GetRuntimeId();
   virtual FilePath GetPath();
   virtual bool IsOffTheRecord();
   virtual Profile* GetOffTheRecordProfile();
   virtual void DestroyOffTheRecordProfile();
   virtual Profile* GetOriginalProfile();
   virtual ChromeAppCacheService* GetAppCacheService();
   virtual VisitedLinkMaster* GetVisitedLinkMaster();
   virtual UserScriptMaster* GetUserScriptMaster();
   virtual SSLHostState* GetSSLHostState();
   virtual net::StrictTransportSecurityState* GetStrictTransportSecurityState();
@@ skipping 146 matching lines @@
   // GetSessionService won't recreate the SessionService.
   bool shutdown_session_service_;
 
 #if defined(OS_CHROMEOS)
   Touchpad touchpad_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ProfileImpl);
 };
 
-#if defined(COMPILER_GCC)
-namespace __gnu_cxx {
-
-template<>
-struct hash<Profile*> {
-  std::size_t operator()(Profile* const& p) const {
-    return reinterpret_cast<std::size_t>(p);
-  }
-};
-
-}  // namespace __gnu_cxx
-#endif
-
 // This struct is used to pass the spellchecker object through the notification
 // SPELLCHECKER_REINITIALIZED. This is used as the details for the notification
 // service.
 struct SpellcheckerReinitializedDetails {
   scoped_refptr<SpellChecker> spellchecker;
 };
 
 #endif  // CHROME_BROWSER_PROFILE_H_