| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chromecast/browser/pref_service_helper.h" | 5 #include "chromecast/browser/pref_service_helper.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/path_service.h" | 12 #include "base/path_service.h" |
| 13 #include "base/prefs/json_pref_store.h" | 13 #include "base/prefs/json_pref_store.h" |
| 14 #include "base/prefs/pref_registry_simple.h" | 14 #include "base/prefs/pref_registry_simple.h" |
| 15 #include "base/prefs/pref_service_factory.h" | 15 #include "base/prefs/pref_service_factory.h" |
| 16 #include "base/prefs/pref_store.h" | 16 #include "base/prefs/pref_store.h" |
| 17 #include "chromecast/common/cast_paths.h" | 17 #include "chromecast/base/cast_paths.h" |
| 18 #include "chromecast/common/pref_names.h" | 18 #include "chromecast/common/pref_names.h" |
| 19 #include "content/public/browser/browser_thread.h" | 19 #include "content/public/browser/browser_thread.h" |
| 20 | 20 |
| 21 namespace chromecast { | 21 namespace chromecast { |
| 22 namespace shell { | 22 namespace shell { |
| 23 | 23 |
| 24 namespace { | 24 namespace { |
| 25 | 25 |
| 26 void UserPrefsLoadError(PersistentPrefStore::PrefReadError* error_val, | 26 void UserPrefsLoadError(PersistentPrefStore::PrefReadError* error_val, |
| 27 PersistentPrefStore::PrefReadError error) { | 27 PersistentPrefStore::PrefReadError error) { |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 << config_path.value() | 67 << config_path.value() |
| 68 << ", pref_error=" << prefs_read_error; | 68 << ", pref_error=" << prefs_read_error; |
| 69 } | 69 } |
| 70 | 70 |
| 71 OnPrefsLoaded(pref_service.get()); | 71 OnPrefsLoaded(pref_service.get()); |
| 72 return pref_service.Pass(); | 72 return pref_service.Pass(); |
| 73 } | 73 } |
| 74 | 74 |
| 75 } // namespace shell | 75 } // namespace shell |
| 76 } // namespace chromecast | 76 } // namespace chromecast |
| OLD | NEW |