| 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/installer/util/master_preferences.h" | 5 #include "chrome/installer/util/master_preferences.h" |
| 6 | 6 |
| 7 #include "base/environment.h" | 7 #include "base/environment.h" |
| 8 #include "base/file_util.h" | 8 #include "base/files/file_util.h" |
| 9 #include "base/json/json_string_value_serializer.h" | 9 #include "base/json/json_string_value_serializer.h" |
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.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/strings/string_util.h" | 13 #include "base/strings/string_util.h" |
| 14 #include "chrome/common/env_vars.h" | 14 #include "chrome/common/env_vars.h" |
| 15 #include "chrome/common/pref_names.h" | 15 #include "chrome/common/pref_names.h" |
| 16 #include "chrome/installer/util/master_preferences_constants.h" | 16 #include "chrome/installer/util/master_preferences_constants.h" |
| 17 #include "chrome/installer/util/util_constants.h" | 17 #include "chrome/installer/util/util_constants.h" |
| 18 | 18 |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 328 } | 328 } |
| 329 return result; | 329 return result; |
| 330 } | 330 } |
| 331 | 331 |
| 332 // static | 332 // static |
| 333 const MasterPreferences& MasterPreferences::ForCurrentProcess() { | 333 const MasterPreferences& MasterPreferences::ForCurrentProcess() { |
| 334 return g_master_preferences.Get(); | 334 return g_master_preferences.Get(); |
| 335 } | 335 } |
| 336 | 336 |
| 337 } // namespace installer | 337 } // namespace installer |
| OLD | NEW |