Introduce incognito preference settings.

chrome/browser/profiles/profile_impl.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/profile_impl.h"
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 642 matching lines @@
         new TransportSecurityPersister();
     transport_security_persister_->Initialize(
         transport_security_state_.get(), path_);
   }
 
   return transport_security_state_.get();
 }
 
 PrefService* ProfileImpl::GetPrefs() {
   if (!prefs_.get()) {
-    ExtensionPrefStore* extension_pref_store = new ExtensionPrefStore;
-    prefs_.reset(PrefService::CreatePrefService(GetPrefFilePath(),
-                                                extension_pref_store,
-                                                GetOriginalProfile()));
+    extension_pref_value_map_.reset(new ExtensionPrefValueMap);
+    prefs_.reset(PrefService::CreatePrefService(
+        GetPrefFilePath(),
+        new ExtensionPrefStore(extension_pref_value_map_.get(), false),
+        GetOriginalProfile()));
 
     // The Profile class and ProfileManager class may read some prefs so
     // register known prefs as soon as possible.
     Profile::RegisterUserPrefs(prefs_.get());
     browser::RegisterUserPrefs(prefs_.get());
 
     // The last session exited cleanly if there is no pref for
     // kSessionExitedCleanly or the value for kSessionExitedCleanly is true.
     last_session_exited_cleanly_ =
         prefs_->GetBoolean(prefs::kSessionExitedCleanly);
     // Mark the session as open.
     prefs_->SetBoolean(prefs::kSessionExitedCleanly, false);
     // Make sure we save to disk that the session has opened.
     prefs_->ScheduleSavePersistentPrefs();
 
     // Ensure that preferences set by extensions are restored in the profile
     // as early as possible. The constructor takes care of that.
+

[Mattias Nissler (ping if slow), 2011/01/07 10:12:58]

Why this newline?

[battre, 2011/01/10 16:55:47]

Done.

     extension_prefs_.reset(new ExtensionPrefs(
         prefs_.get(),
         GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
-        extension_pref_store));
+        extension_pref_value_map_.get()));
 
     DCHECK(!net_pref_observer_.get());
     net_pref_observer_.reset(new NetPrefObserver(prefs_.get()));
   }
 
   return prefs_.get();
 }
 
 FilePath ProfileImpl::GetPrefFilePath() {
   FilePath pref_file_path = path_;
@@ skipping 664 matching lines @@
 }
 
 PrerenderManager* ProfileImpl::GetPrerenderManager() {
   CommandLine* cl = CommandLine::ForCurrentProcess();
   if (!cl->HasSwitch(switches::kEnablePagePrerender))
     return NULL;
   if (!prerender_manager_.get())
     prerender_manager_.reset(new PrerenderManager(this));
   return prerender_manager_.get();
 }