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

Side by Side Diff: components/prefs/json_pref_store.cc

Issue 1651203002: Update components for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 unified diff | Download patch
« no previous file with comments | « components/prefs/json_pref_store.h ('k') | components/prefs/json_pref_store_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/prefs/json_pref_store.h" 5 #include "components/prefs/json_pref_store.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
15 #include "base/files/file_util.h" 15 #include "base/files/file_util.h"
16 #include "base/json/json_file_value_serializer.h" 16 #include "base/json/json_file_value_serializer.h"
17 #include "base/json/json_string_value_serializer.h" 17 #include "base/json/json_string_value_serializer.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "base/memory/ref_counted.h" 19 #include "base/memory/ref_counted.h"
20 #include "base/metrics/histogram.h" 20 #include "base/metrics/histogram.h"
21 #include "base/prefs/pref_filter.h"
22 #include "base/sequenced_task_runner.h" 21 #include "base/sequenced_task_runner.h"
23 #include "base/strings/string_number_conversions.h" 22 #include "base/strings/string_number_conversions.h"
24 #include "base/strings/string_util.h" 23 #include "base/strings/string_util.h"
25 #include "base/task_runner_util.h" 24 #include "base/task_runner_util.h"
26 #include "base/threading/sequenced_worker_pool.h" 25 #include "base/threading/sequenced_worker_pool.h"
27 #include "base/time/default_clock.h" 26 #include "base/time/default_clock.h"
28 #include "base/values.h" 27 #include "base/values.h"
28 #include "components/prefs/pref_filter.h"
29 29
30 // Result returned from internal read tasks. 30 // Result returned from internal read tasks.
31 struct JsonPrefStore::ReadResult { 31 struct JsonPrefStore::ReadResult {
32 public: 32 public:
33 ReadResult(); 33 ReadResult();
34 ~ReadResult(); 34 ~ReadResult();
35 35
36 scoped_ptr<base::Value> value; 36 scoped_ptr<base::Value> value;
37 PrefReadError error; 37 PrefReadError error;
38 bool no_dir; 38 bool no_dir;
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 DCHECK_EQ(31, num_buckets); 528 DCHECK_EQ(31, num_buckets);
529 529
530 // The histogram below is an expansion of the UMA_HISTOGRAM_CUSTOM_COUNTS 530 // The histogram below is an expansion of the UMA_HISTOGRAM_CUSTOM_COUNTS
531 // macro adapted to allow for a dynamically suffixed histogram name. 531 // macro adapted to allow for a dynamically suffixed histogram name.
532 // Note: The factory creates and owns the histogram. 532 // Note: The factory creates and owns the histogram.
533 base::HistogramBase* histogram = base::Histogram::FactoryGet( 533 base::HistogramBase* histogram = base::Histogram::FactoryGet(
534 histogram_name, min_value, max_value, num_buckets, 534 histogram_name, min_value, max_value, num_buckets,
535 base::HistogramBase::kUmaTargetedHistogramFlag); 535 base::HistogramBase::kUmaTargetedHistogramFlag);
536 return histogram; 536 return histogram;
537 } 537 }
OLDNEW
« no previous file with comments | « components/prefs/json_pref_store.h ('k') | components/prefs/json_pref_store_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698