| 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 #ifndef CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_ | 6 #define CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> |
| 9 #include <string> | 10 #include <string> |
| 10 #include <vector> | 11 #include <vector> |
| 11 | 12 |
| 12 #include "base/gtest_prod_util.h" | 13 #include "base/gtest_prod_util.h" |
| 13 #include "base/macros.h" | 14 #include "base/macros.h" |
| 14 #include "base/memory/scoped_ptr.h" | |
| 15 #include "base/memory/singleton.h" | 15 #include "base/memory/singleton.h" |
| 16 #include "base/time/time.h" | 16 #include "base/time/time.h" |
| 17 #include "chrome/browser/chromeos/customization/customization_document.h" | 17 #include "chrome/browser/chromeos/customization/customization_document.h" |
| 18 | 18 |
| 19 namespace base { | 19 namespace base { |
| 20 class DictionaryValue; | 20 class DictionaryValue; |
| 21 class FilePath; | 21 class FilePath; |
| 22 } | 22 } |
| 23 | 23 |
| 24 namespace chromeos { | 24 namespace chromeos { |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 void ReadConfigInBackground(const base::FilePath& global_config_file, | 183 void ReadConfigInBackground(const base::FilePath& global_config_file, |
| 184 const base::FilePath& local_config_file); | 184 const base::FilePath& local_config_file); |
| 185 | 185 |
| 186 // Maps external carrier ID to internal carrier ID. | 186 // Maps external carrier ID to internal carrier ID. |
| 187 CarrierIdMap carrier_id_map_; | 187 CarrierIdMap carrier_id_map_; |
| 188 | 188 |
| 189 // Carrier configuration (including carrier deals). | 189 // Carrier configuration (including carrier deals). |
| 190 Carriers carriers_; | 190 Carriers carriers_; |
| 191 | 191 |
| 192 // Initial locale specific config if defined. | 192 // Initial locale specific config if defined. |
| 193 scoped_ptr<LocaleConfig> locale_config_; | 193 std::unique_ptr<LocaleConfig> locale_config_; |
| 194 | 194 |
| 195 // Initial locale value. | 195 // Initial locale value. |
| 196 std::string initial_locale_; | 196 std::string initial_locale_; |
| 197 | 197 |
| 198 // Root value of the local config (if it exists). | 198 // Root value of the local config (if it exists). |
| 199 // Global config is stored in root_ of the base class. | 199 // Global config is stored in root_ of the base class. |
| 200 scoped_ptr<base::DictionaryValue> local_config_root_; | 200 std::unique_ptr<base::DictionaryValue> local_config_root_; |
| 201 | 201 |
| 202 DISALLOW_COPY_AND_ASSIGN(MobileConfig); | 202 DISALLOW_COPY_AND_ASSIGN(MobileConfig); |
| 203 }; | 203 }; |
| 204 | 204 |
| 205 } // namespace chromeos | 205 } // namespace chromeos |
| 206 | 206 |
| 207 #endif // CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_ | 207 #endif // CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_ |
| OLD | NEW |