| 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/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" |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 { installer::switches::kAutoLaunchChrome, | 144 { installer::switches::kAutoLaunchChrome, |
| 145 installer::master_preferences::kAutoLaunchChrome }, | 145 installer::master_preferences::kAutoLaunchChrome }, |
| 146 { installer::switches::kChromeAppHostDeprecated, | 146 { installer::switches::kChromeAppHostDeprecated, |
| 147 installer::master_preferences::kChromeAppHostDeprecated }, | 147 installer::master_preferences::kChromeAppHostDeprecated }, |
| 148 { installer::switches::kChromeAppLauncher, | 148 { installer::switches::kChromeAppLauncher, |
| 149 installer::master_preferences::kChromeAppLauncher }, | 149 installer::master_preferences::kChromeAppLauncher }, |
| 150 { installer::switches::kChrome, | 150 { installer::switches::kChrome, |
| 151 installer::master_preferences::kChrome }, | 151 installer::master_preferences::kChrome }, |
| 152 { installer::switches::kChromeFrame, | 152 { installer::switches::kChromeFrame, |
| 153 installer::master_preferences::kChromeFrame }, | 153 installer::master_preferences::kChromeFrame }, |
| 154 { installer::switches::kChromeFrameReadyMode, | |
| 155 installer::master_preferences::kChromeFrameReadyMode }, | |
| 156 { installer::switches::kDisableLogging, | 154 { installer::switches::kDisableLogging, |
| 157 installer::master_preferences::kDisableLogging }, | 155 installer::master_preferences::kDisableLogging }, |
| 158 { installer::switches::kMsi, | 156 { installer::switches::kMsi, |
| 159 installer::master_preferences::kMsi }, | 157 installer::master_preferences::kMsi }, |
| 160 { installer::switches::kMultiInstall, | 158 { installer::switches::kMultiInstall, |
| 161 installer::master_preferences::kMultiInstall }, | 159 installer::master_preferences::kMultiInstall }, |
| 162 { installer::switches::kDoNotRegisterForUpdateLaunch, | 160 { installer::switches::kDoNotRegisterForUpdateLaunch, |
| 163 installer::master_preferences::kDoNotRegisterForUpdateLaunch }, | 161 installer::master_preferences::kDoNotRegisterForUpdateLaunch }, |
| 164 { installer::switches::kDoNotLaunchChrome, | 162 { installer::switches::kDoNotLaunchChrome, |
| 165 installer::master_preferences::kDoNotLaunchChrome }, | 163 installer::master_preferences::kDoNotLaunchChrome }, |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 330 master_dictionary_->GetString(prefs::kVariationsSeed, &variations_seed); | 328 master_dictionary_->GetString(prefs::kVariationsSeed, &variations_seed); |
| 331 return variations_seed; | 329 return variations_seed; |
| 332 } | 330 } |
| 333 | 331 |
| 334 // static | 332 // static |
| 335 const MasterPreferences& MasterPreferences::ForCurrentProcess() { | 333 const MasterPreferences& MasterPreferences::ForCurrentProcess() { |
| 336 return g_master_preferences.Get(); | 334 return g_master_preferences.Get(); |
| 337 } | 335 } |
| 338 | 336 |
| 339 } // namespace installer | 337 } // namespace installer |
| OLD | NEW |