| OLD | NEW |
| 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 "chrome/common/json_pref_store.h" | 5 #include "base/prefs/json_pref_store.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| 11 #include "base/file_util.h" | 11 #include "base/file_util.h" |
| 12 #include "base/json/json_file_value_serializer.h" | 12 #include "base/json/json_file_value_serializer.h" |
| 13 #include "base/json/json_string_value_serializer.h" | 13 #include "base/json/json_string_value_serializer.h" |
| 14 #include "base/memory/ref_counted.h" | 14 #include "base/memory/ref_counted.h" |
| 15 #include "base/message_loop_proxy.h" | 15 #include "base/message_loop_proxy.h" |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 copy->Set(key, new base::ListValue); | 335 copy->Set(key, new base::ListValue); |
| 336 } else if (value->IsType(base::Value::TYPE_DICTIONARY)) { | 336 } else if (value->IsType(base::Value::TYPE_DICTIONARY)) { |
| 337 const base::DictionaryValue* dict = NULL; | 337 const base::DictionaryValue* dict = NULL; |
| 338 if (value->GetAsDictionary(&dict) && dict->empty()) | 338 if (value->GetAsDictionary(&dict) && dict->empty()) |
| 339 copy->Set(key, new base::DictionaryValue); | 339 copy->Set(key, new base::DictionaryValue); |
| 340 } | 340 } |
| 341 } | 341 } |
| 342 | 342 |
| 343 return serializer.Serialize(*(copy.get())); | 343 return serializer.Serialize(*(copy.get())); |
| 344 } | 344 } |
| OLD | NEW |