| 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/sequenced_task_runner.h" |
| 13 #include "chromecast/base/cast_paths.h" | 14 #include "chromecast/base/cast_paths.h" |
| 14 #include "chromecast/base/pref_names.h" | 15 #include "chromecast/base/pref_names.h" |
| 15 #include "components/prefs/json_pref_store.h" | 16 #include "components/prefs/json_pref_store.h" |
| 16 #include "components/prefs/pref_registry_simple.h" | 17 #include "components/prefs/pref_registry_simple.h" |
| 17 #include "components/prefs/pref_service_factory.h" | 18 #include "components/prefs/pref_service_factory.h" |
| 18 #include "components/prefs/pref_store.h" | 19 #include "components/prefs/pref_store.h" |
| 19 #include "content/public/browser/browser_thread.h" | 20 #include "content/public/browser/browser_thread.h" |
| 20 | 21 |
| 21 namespace chromecast { | 22 namespace chromecast { |
| 22 namespace shell { | 23 namespace shell { |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 << config_path.value() | 77 << config_path.value() |
| 77 << ", pref_error=" << prefs_read_error; | 78 << ", pref_error=" << prefs_read_error; |
| 78 } | 79 } |
| 79 | 80 |
| 80 OnPrefsLoaded(pref_service.get()); | 81 OnPrefsLoaded(pref_service.get()); |
| 81 return pref_service; | 82 return pref_service; |
| 82 } | 83 } |
| 83 | 84 |
| 84 } // namespace shell | 85 } // namespace shell |
| 85 } // namespace chromecast | 86 } // namespace chromecast |
| OLD | NEW |