Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Unified Diff: chrome/browser/prefs/pref_service.h

Issue 9251026: Reinitialize LocalState's CommandLinePrefStore after about_flags updates the command line. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix presubmit checks, no code change Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/prefs/overlay_user_pref_store.cc ('k') | chrome/browser/prefs/pref_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/pref_service.h
===================================================================
--- chrome/browser/prefs/pref_service.h (revision 118876)
+++ chrome/browser/prefs/pref_service.h (working copy)
@@ -1,4 +1,4 @@
-// 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.
@@ -17,6 +17,7 @@
#include "base/values.h"
#include "chrome/common/json_pref_store.h"
+class CommandLine;
class DefaultPrefStore;
class FilePath;
class PersistentPrefStore;
@@ -52,7 +53,6 @@
// 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
@@ -297,6 +297,10 @@
// 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.
@@ -390,6 +394,11 @@
// 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);
};
« no previous file with comments | « chrome/browser/prefs/overlay_user_pref_store.cc ('k') | chrome/browser/prefs/pref_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698