summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authormsw <msw@chromium.org>2016-02-02 17:25:06 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-03 01:26:34 +0000
commit456d842422a8cf9954ebeab7615059a0129812de (patch)
tree66113703585a40588dcb52d8bbf779805b8f3788 /base
parent91375c125e08b6b53bb7c7e3eaedab1ef7c08a0b (diff)
downloadchromium_src-456d842422a8cf9954ebeab7615059a0129812de.zip
chromium_src-456d842422a8cf9954ebeab7615059a0129812de.tar.gz
chromium_src-456d842422a8cf9954ebeab7615059a0129812de.tar.bz2
Revert of Delete base/prefs and update callers to use components. (patchset #3 id:40001 of https://codereview.chromium.org/1662523004/ )
Reason for revert: Broke Win Builder compile: https://build.chromium.org/p/chromium.win/builders/Win%20Builder/builds/19463/steps/compile/logs/stdio Original issue's description: > Delete base/prefs and update callers to use components. > > Deletes the forwarding headers in base/prefs. > > Updates the remaining users of base/prefs includes to use components/prefs. > Sort headers in updated files. > > Move PrefServiceFactory out of the base namespace. Update users. > > Update all preprocessor stuff in components/prefs to change BASE_PREFS_ to > COMPONENTS_PREFS_. > > Add components/prefs to DEPS file of directories where checkdeps fails after > the update. > > BUG=583034 > > Committed: https://crrev.com/1f5feb7e317e3c257090858e950273b64a2e31ef > Cr-Commit-Position: refs/heads/master@{#373105} TBR=estade@chromium.org,brettw@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=583034 Review URL: https://codereview.chromium.org/1662843002 Cr-Commit-Position: refs/heads/master@{#373115}
Diffstat (limited to 'base')
-rw-r--r--base/prefs/DEPS4
-rw-r--r--base/prefs/base_prefs_export.h7
-rw-r--r--base/prefs/default_pref_store.h7
-rw-r--r--base/prefs/json_pref_store.h7
-rw-r--r--base/prefs/mock_pref_change_callback.h7
-rw-r--r--base/prefs/overlay_user_pref_store.h7
-rw-r--r--base/prefs/persistent_pref_store.h7
-rw-r--r--base/prefs/pref_change_registrar.h7
-rw-r--r--base/prefs/pref_filter.h7
-rw-r--r--base/prefs/pref_member.h7
-rw-r--r--base/prefs/pref_notifier.h7
-rw-r--r--base/prefs/pref_notifier_impl.h7
-rw-r--r--base/prefs/pref_observer.h7
-rw-r--r--base/prefs/pref_registry.h7
-rw-r--r--base/prefs/pref_registry_simple.h7
-rw-r--r--base/prefs/pref_service.h7
-rw-r--r--base/prefs/pref_service_factory.h7
-rw-r--r--base/prefs/pref_store.h7
-rw-r--r--base/prefs/pref_store_observer_mock.h7
-rw-r--r--base/prefs/pref_value_map.h7
-rw-r--r--base/prefs/pref_value_store.h7
-rw-r--r--base/prefs/scoped_user_pref_update.h7
-rw-r--r--base/prefs/testing_pref_service.h7
-rw-r--r--base/prefs/testing_pref_store.h7
-rw-r--r--base/prefs/value_map_pref_store.h7
-rw-r--r--base/prefs/writeable_pref_store.h7
26 files changed, 179 insertions, 0 deletions
diff --git a/base/prefs/DEPS b/base/prefs/DEPS
new file mode 100644
index 0000000..2edd44e
--- /dev/null
+++ b/base/prefs/DEPS
@@ -0,0 +1,4 @@
+# TODO(brettw) remove this when prefs is completely moved to components.
+include_rules = [
+ "+components/prefs",
+]
diff --git a/base/prefs/base_prefs_export.h b/base/prefs/base_prefs_export.h
new file mode 100644
index 0000000..477e1aa
--- /dev/null
+++ b/base/prefs/base_prefs_export.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/base_prefs_export.h"
diff --git a/base/prefs/default_pref_store.h b/base/prefs/default_pref_store.h
new file mode 100644
index 0000000..e590bf8
--- /dev/null
+++ b/base/prefs/default_pref_store.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/default_pref_store.h"
diff --git a/base/prefs/json_pref_store.h b/base/prefs/json_pref_store.h
new file mode 100644
index 0000000..247102f
--- /dev/null
+++ b/base/prefs/json_pref_store.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/json_pref_store.h"
diff --git a/base/prefs/mock_pref_change_callback.h b/base/prefs/mock_pref_change_callback.h
new file mode 100644
index 0000000..90ad294
--- /dev/null
+++ b/base/prefs/mock_pref_change_callback.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/mock_pref_change_callback.h"
diff --git a/base/prefs/overlay_user_pref_store.h b/base/prefs/overlay_user_pref_store.h
new file mode 100644
index 0000000..594c501
--- /dev/null
+++ b/base/prefs/overlay_user_pref_store.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/overlay_user_pref_store.h"
diff --git a/base/prefs/persistent_pref_store.h b/base/prefs/persistent_pref_store.h
new file mode 100644
index 0000000..a0fcf68
--- /dev/null
+++ b/base/prefs/persistent_pref_store.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/persistent_pref_store.h"
diff --git a/base/prefs/pref_change_registrar.h b/base/prefs/pref_change_registrar.h
new file mode 100644
index 0000000..517b63f
--- /dev/null
+++ b/base/prefs/pref_change_registrar.h
@@ -0,0 +1,7 @@
+// Copyright (c) 2010 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/pref_change_registrar.h"
diff --git a/base/prefs/pref_filter.h b/base/prefs/pref_filter.h
new file mode 100644
index 0000000..6ed06bc
--- /dev/null
+++ b/base/prefs/pref_filter.h
@@ -0,0 +1,7 @@
+// Copyright 2013 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/pref_filter.h"
diff --git a/base/prefs/pref_member.h b/base/prefs/pref_member.h
new file mode 100644
index 0000000..ff90e5e
--- /dev/null
+++ b/base/prefs/pref_member.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/pref_member.h"
diff --git a/base/prefs/pref_notifier.h b/base/prefs/pref_notifier.h
new file mode 100644
index 0000000..d99f5b8
--- /dev/null
+++ b/base/prefs/pref_notifier.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/pref_notifier.h"
diff --git a/base/prefs/pref_notifier_impl.h b/base/prefs/pref_notifier_impl.h
new file mode 100644
index 0000000..f47cc3e
--- /dev/null
+++ b/base/prefs/pref_notifier_impl.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/pref_notifier_impl.h"
diff --git a/base/prefs/pref_observer.h b/base/prefs/pref_observer.h
new file mode 100644
index 0000000..df5d1af
--- /dev/null
+++ b/base/prefs/pref_observer.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/pref_observer.h"
diff --git a/base/prefs/pref_registry.h b/base/prefs/pref_registry.h
new file mode 100644
index 0000000..94126d1
--- /dev/null
+++ b/base/prefs/pref_registry.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/pref_registry.h"
diff --git a/base/prefs/pref_registry_simple.h b/base/prefs/pref_registry_simple.h
new file mode 100644
index 0000000..0f157a2
--- /dev/null
+++ b/base/prefs/pref_registry_simple.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/pref_registry_simple.h"
diff --git a/base/prefs/pref_service.h b/base/prefs/pref_service.h
new file mode 100644
index 0000000..aced2f0
--- /dev/null
+++ b/base/prefs/pref_service.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/pref_service.h"
diff --git a/base/prefs/pref_service_factory.h b/base/prefs/pref_service_factory.h
new file mode 100644
index 0000000..3bc4932
--- /dev/null
+++ b/base/prefs/pref_service_factory.h
@@ -0,0 +1,7 @@
+// Copyright 2013 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/pref_service_factory.h"
diff --git a/base/prefs/pref_store.h b/base/prefs/pref_store.h
new file mode 100644
index 0000000..c1c6583
--- /dev/null
+++ b/base/prefs/pref_store.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/pref_store.h"
diff --git a/base/prefs/pref_store_observer_mock.h b/base/prefs/pref_store_observer_mock.h
new file mode 100644
index 0000000..be8e4d5
--- /dev/null
+++ b/base/prefs/pref_store_observer_mock.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/pref_store_observer_mock.h"
diff --git a/base/prefs/pref_value_map.h b/base/prefs/pref_value_map.h
new file mode 100644
index 0000000..e1ec94a
--- /dev/null
+++ b/base/prefs/pref_value_map.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/pref_value_map.h"
diff --git a/base/prefs/pref_value_store.h b/base/prefs/pref_value_store.h
new file mode 100644
index 0000000..de10c56
--- /dev/null
+++ b/base/prefs/pref_value_store.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/pref_value_store.h"
diff --git a/base/prefs/scoped_user_pref_update.h b/base/prefs/scoped_user_pref_update.h
new file mode 100644
index 0000000..ce03c6a
--- /dev/null
+++ b/base/prefs/scoped_user_pref_update.h
@@ -0,0 +1,7 @@
+// Copyright 2013 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/scoped_user_pref_update.h"
diff --git a/base/prefs/testing_pref_service.h b/base/prefs/testing_pref_service.h
new file mode 100644
index 0000000..c60b89e
--- /dev/null
+++ b/base/prefs/testing_pref_service.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/testing_pref_service.h"
diff --git a/base/prefs/testing_pref_store.h b/base/prefs/testing_pref_store.h
new file mode 100644
index 0000000..297aa11
--- /dev/null
+++ b/base/prefs/testing_pref_store.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/testing_pref_store.h"
diff --git a/base/prefs/value_map_pref_store.h b/base/prefs/value_map_pref_store.h
new file mode 100644
index 0000000..4373ff7
--- /dev/null
+++ b/base/prefs/value_map_pref_store.h
@@ -0,0 +1,7 @@
+// 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/value_map_pref_store.h"
diff --git a/base/prefs/writeable_pref_store.h b/base/prefs/writeable_pref_store.h
new file mode 100644
index 0000000..69bd2cb
--- /dev/null
+++ b/base/prefs/writeable_pref_store.h
@@ -0,0 +1,7 @@
+// Copyright 2014 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.
+
+// TODO(brettw) remove this forwarding header when prefs is completely moved to
+// components.
+#include "components/prefs/writeable_pref_store.h"