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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
274 #endif | 274 #endif |
275 | 275 |
276 #if defined(USE_VIRTUAL_KEYBOARD) | 276 #if defined(USE_VIRTUAL_KEYBOARD) |
277 Add(IDR_KEYBOARD_MANIFEST, FilePath(FILE_PATH_LITERAL("keyboard"))); | 277 Add(IDR_KEYBOARD_MANIFEST, FilePath(FILE_PATH_LITERAL("keyboard"))); |
278 #endif | 278 #endif |
279 | 279 |
280 #if defined(OS_CHROMEOS) | 280 #if defined(OS_CHROMEOS) |
281 Add(IDR_MOBILE_MANIFEST, | 281 Add(IDR_MOBILE_MANIFEST, |
282 FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile"))); | 282 FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile"))); |
283 | 283 |
| 284 Add(IDR_CROSH_BUILTIN_MANIFEST, FilePath(FILE_PATH_LITERAL( |
| 285 "/usr/share/chromeos-assets/crosh_builtin"))); |
| 286 |
284 const CommandLine* command_line = CommandLine::ForCurrentProcess(); | 287 const CommandLine* command_line = CommandLine::ForCurrentProcess(); |
285 if (command_line->HasSwitch(switches::kAuthExtensionPath)) { | 288 if (command_line->HasSwitch(switches::kAuthExtensionPath)) { |
286 FilePath auth_extension_path = | 289 FilePath auth_extension_path = |
287 command_line->GetSwitchValuePath(switches::kAuthExtensionPath); | 290 command_line->GetSwitchValuePath(switches::kAuthExtensionPath); |
288 Add(IDR_GAIA_TEST_AUTH_MANIFEST, auth_extension_path); | 291 Add(IDR_GAIA_TEST_AUTH_MANIFEST, auth_extension_path); |
289 } else { | 292 } else { |
290 Add(IDR_GAIA_AUTH_MANIFEST, | 293 Add(IDR_GAIA_AUTH_MANIFEST, |
291 FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/gaia_auth"))); | 294 FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/gaia_auth"))); |
292 } | 295 } |
293 | 296 |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
342 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) { | 345 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) { |
343 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL, | 346 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL, |
344 std::string() /* default_value */, | 347 std::string() /* default_value */, |
345 PrefService::UNSYNCABLE_PREF); | 348 PrefService::UNSYNCABLE_PREF); |
346 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName, | 349 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName, |
347 std::string() /* default_value */, | 350 std::string() /* default_value */, |
348 PrefService::UNSYNCABLE_PREF); | 351 PrefService::UNSYNCABLE_PREF); |
349 } | 352 } |
350 | 353 |
351 } // namespace extensions | 354 } // namespace extensions |
OLD | NEW |