| 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/browser/extensions/component_loader.h" | 5 #include "chrome/browser/extensions/component_loader.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.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/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 const CommandLine* command_line = CommandLine::ForCurrentProcess(); | 288 const CommandLine* command_line = CommandLine::ForCurrentProcess(); |
| 289 if (command_line->HasSwitch(switches::kAuthExtensionPath)) { | 289 if (command_line->HasSwitch(switches::kAuthExtensionPath)) { |
| 290 FilePath auth_extension_path = | 290 FilePath auth_extension_path = |
| 291 command_line->GetSwitchValuePath(switches::kAuthExtensionPath); | 291 command_line->GetSwitchValuePath(switches::kAuthExtensionPath); |
| 292 Add(IDR_GAIA_TEST_AUTH_MANIFEST, auth_extension_path); | 292 Add(IDR_GAIA_TEST_AUTH_MANIFEST, auth_extension_path); |
| 293 } else { | 293 } else { |
| 294 Add(IDR_GAIA_AUTH_MANIFEST, | 294 Add(IDR_GAIA_AUTH_MANIFEST, |
| 295 FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/gaia_auth"))); | 295 FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/gaia_auth"))); |
| 296 } | 296 } |
| 297 | 297 |
| 298 // TODO(gauravsh): Only include offers extension on official builds. | 298 // TODO(gauravsh): Only include echo extension on official builds. |
| 299 FilePath offers_extension_path(FILE_PATH_LITERAL( | 299 FilePath echo_extension_path(FILE_PATH_LITERAL( |
| 300 "/usr/share/chromeos-assets/offers")); | 300 "/usr/share/chromeos-assets/echo")); |
| 301 if (command_line->HasSwitch(switches::kOffersExtensionPath)) { | 301 if (command_line->HasSwitch(switches::kEchoExtensionPath)) { |
| 302 offers_extension_path = | 302 echo_extension_path = |
| 303 command_line->GetSwitchValuePath(switches::kOffersExtensionPath); | 303 command_line->GetSwitchValuePath(switches::kEchoExtensionPath); |
| 304 } | 304 } |
| 305 Add(IDR_OFFERS_MANIFEST, offers_extension_path); | 305 Add(IDR_ECHO_MANIFEST, echo_extension_path); |
| 306 | 306 |
| 307 #if defined(OFFICIAL_BUILD) | 307 #if defined(OFFICIAL_BUILD) |
| 308 if (browser_defaults::enable_help_app) { | 308 if (browser_defaults::enable_help_app) { |
| 309 Add(IDR_HELP_MANIFEST, | 309 Add(IDR_HELP_MANIFEST, |
| 310 FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp"))); | 310 FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp"))); |
| 311 } | 311 } |
| 312 #endif | 312 #endif |
| 313 #endif // !defined(OS_CHROMEOS) | 313 #endif // !defined(OS_CHROMEOS) |
| 314 | 314 |
| 315 Add(IDR_WEBSTORE_MANIFEST, FilePath(FILE_PATH_LITERAL("web_store"))); | 315 Add(IDR_WEBSTORE_MANIFEST, FilePath(FILE_PATH_LITERAL("web_store"))); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) { | 355 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) { |
| 356 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL, | 356 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL, |
| 357 std::string() /* default_value */, | 357 std::string() /* default_value */, |
| 358 PrefService::UNSYNCABLE_PREF); | 358 PrefService::UNSYNCABLE_PREF); |
| 359 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName, | 359 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName, |
| 360 std::string() /* default_value */, | 360 std::string() /* default_value */, |
| 361 PrefService::UNSYNCABLE_PREF); | 361 PrefService::UNSYNCABLE_PREF); |
| 362 } | 362 } |
| 363 | 363 |
| 364 } // namespace extensions | 364 } // namespace extensions |
| OLD | NEW |