Reinitialize LocalState's CommandLinePrefStore after about_flags updates the command line.

chrome/browser/prefs/pref_service.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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 provides a way to access the application's current preferences.
 
 #ifndef CHROME_BROWSER_PREFS_PREF_SERVICE_H_
 #define CHROME_BROWSER_PREFS_PREF_SERVICE_H_
 #pragma once
 
 #include <set>
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/values.h"
 #include "chrome/common/json_pref_store.h"
 
+class CommandLine;
 class DefaultPrefStore;
 class FilePath;
 class PersistentPrefStore;
 class PrefModelAssociator;
 class PrefNotifier;
 class PrefNotifierImpl;
 class PrefStore;
 class PrefValueStore;
 class Profile;
 class SyncableService;
@@ skipping 15 matching lines @@
   // or not. This is only used for profile prefs, not local state prefs.
   // See the Register*Pref methods for profile prefs below.
   enum PrefSyncStatus {
     UNSYNCABLE_PREF,
     SYNCABLE_PREF
   };
 
   // A helper class to store all the information associated with a preference.
   class Preference {
    public:
-
     // The type of the preference is determined by the type with which it is
     // registered. This type needs to be a boolean, integer, double, string,
     // dictionary (a branch), or list.  You shouldn't need to construct this on
     // your own; use the PrefService::Register*Pref methods instead.
     Preference(const PrefService* service,
                const char* name,
                base::Value::Type type);
     ~Preference() {}
 
     // Returns the name of the Preference (i.e., the key, e.g.,
@@ skipping 224 matching lines @@
   // A helper method to quickly look up a preference.  Returns NULL if the
   // preference is not registered.
   const Preference* FindPreference(const char* pref_name) const;
 
   bool ReadOnly() const;
 
   // SyncableService getter.
   // TODO(zea): Have PrefService implement SyncableService directly.
   SyncableService* GetSyncableService();
 
+  // Tell our PrefValueStore to update itself using |command_line|.
+  // Do not call this after having derived an incognito or per tab pref service.
+  void UpdateCommandLinePrefStore(CommandLine* command_line);
+
  protected:
   // Construct a new pref service. This constructor is what
   // factory methods end up calling and what is used for unit tests.
   PrefService(PrefNotifierImpl* pref_notifier,
               PrefValueStore* pref_value_store,
               PersistentPrefStore* user_prefs,
               DefaultPrefStore* default_store,
               PrefModelAssociator* pref_sync_associator,
               bool async);
 
@@ skipping 73 matching lines @@
   scoped_refptr<DefaultPrefStore> default_store_;
 
   // Local cache of registered Preference objects. The default_store_
   // is authoritative with respect to what the types and default values
   // of registered preferences are.
   mutable PreferenceSet prefs_;
 
   // The model associator that maintains the links with the sync db.
   scoped_ptr<PrefModelAssociator> pref_sync_associator_;
 
+  // Whether CreateIncognitoPrefService() or
+  // CreatePrefServiceWithPerTabPrefStore() have been called to create a
+  // "forked" PrefService.
+  bool pref_service_forked_;
+
   DISALLOW_COPY_AND_ASSIGN(PrefService);
 };
 
 #endif  // CHROME_BROWSER_PREFS_PREF_SERVICE_H_