Committing change 255087 for Roger:...

chrome/browser/profile.cc

 // 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.
 
 #include "chrome/browser/profile.h"
 
 #include "app/theme_provider.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 129 matching lines @@
     // The I/O thread may be NULL during testing.
     base::Thread* io_thread = g_browser_process->io_thread();
     if (io_thread)
       io_thread->message_loop()->ReleaseSoon(FROM_HERE, appcache_service);
     else
       appcache_service->Release();
   }
 }
 
 // static
+const ProfileId Profile::InvalidProfileId = static_cast<ProfileId>(0);
+
+// static
 void Profile::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kSearchSuggestEnabled, true);
   prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly, true);
   prefs->RegisterBooleanPref(prefs::kSafeBrowsingEnabled, true);
   // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string.
   prefs->RegisterLocalizedStringPref(prefs::kSpellCheckDictionary,
       IDS_SPELLCHECK_DICTIONARY);
   prefs->RegisterBooleanPref(prefs::kEnableSpellCheck, true);
   prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect, true);
   prefs->RegisterBooleanPref(prefs::kEnableUserScripts, false);
@@ skipping 60 matching lines @@
     registrar_.Add(this, NotificationType::BROWSER_CLOSED,
                    NotificationService::AllSources());
   }
 
   virtual ~OffTheRecordProfileImpl() {
     CleanupRequestContext(request_context_);
     CleanupRequestContext(extensions_request_context_);
     CleanupAppCacheService(appcache_service_);
   }
 
+  virtual ProfileId GetRuntimeId() {
+    return reinterpret_cast<ProfileId>(this);
+  }
+
   virtual FilePath GetPath() { return profile_->GetPath(); }
 
   virtual bool IsOffTheRecord() {
     return true;
   }
 
   virtual Profile* GetOffTheRecordProfile() {
     return this;
   }
 
@@ skipping 551 matching lines @@
   favicon_service_ = NULL;
 
   extension_message_service_->ProfileDestroyed();
 
   if (extensions_service_)
     extensions_service_->ProfileDestroyed();
 
   MarkAsCleanShutdown();
 }
 
+ProfileId ProfileImpl::GetRuntimeId() {
+  return reinterpret_cast<ProfileId>(this);
+}
+
 FilePath ProfileImpl::GetPath() {
   return path_;
 }
 
 bool ProfileImpl::IsOffTheRecord() {
   return false;
 }
 
 Profile* ProfileImpl::GetOffTheRecordProfile() {
   if (!off_the_record_profile_.get()) {
@@ skipping 561 matching lines @@
 #endif
   return NULL;
 }
 
 void ProfileImpl::InitSyncService() {
 #ifdef CHROME_PERSONALIZATION
   sync_service_.reset(new ProfileSyncService(this));
   sync_service_->Initialize();
 #endif
 }