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 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 // Component extensions with background pages are not enabled during tests | 377 // Component extensions with background pages are not enabled during tests |
378 // because they generate a lot of background behavior that can interfere. | 378 // because they generate a lot of background behavior that can interfere. |
379 if (!enable_background_extensions_during_testing && | 379 if (!enable_background_extensions_during_testing && |
380 command_line->HasSwitch(switches::kTestType)) { | 380 command_line->HasSwitch(switches::kTestType)) { |
381 return; | 381 return; |
382 } | 382 } |
383 | 383 |
384 if (!skip_session_components) { | 384 if (!skip_session_components) { |
385 // Apps Debugger | 385 // Apps Debugger |
386 if (CommandLine::ForCurrentProcess()->HasSwitch( | 386 if (CommandLine::ForCurrentProcess()->HasSwitch( |
387 switches::kAppsDebugger)) { | 387 switches::kAppsDevtool)) { |
388 Add(IDR_APPS_DEBUGGER_MANIFEST, | 388 Add(IDR_APPS_DEBUGGER_MANIFEST, |
389 base::FilePath(FILE_PATH_LITERAL("apps_debugger"))); | 389 base::FilePath(FILE_PATH_LITERAL("apps_debugger"))); |
390 } | 390 } |
391 | 391 |
392 AddFileManagerExtension(); | 392 AddFileManagerExtension(); |
393 | 393 |
394 #if defined(ENABLE_SETTINGS_APP) | 394 #if defined(ENABLE_SETTINGS_APP) |
395 Add(IDR_SETTINGS_APP_MANIFEST, | 395 Add(IDR_SETTINGS_APP_MANIFEST, |
396 base::FilePath(FILE_PATH_LITERAL("settings_app"))); | 396 base::FilePath(FILE_PATH_LITERAL("settings_app"))); |
397 #endif | 397 #endif |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
441 void ComponentLoader::RegisterUserPrefs(PrefRegistrySyncable* registry) { | 441 void ComponentLoader::RegisterUserPrefs(PrefRegistrySyncable* registry) { |
442 registry->RegisterStringPref(prefs::kEnterpriseWebStoreURL, | 442 registry->RegisterStringPref(prefs::kEnterpriseWebStoreURL, |
443 std::string() /* default_value */, | 443 std::string() /* default_value */, |
444 PrefRegistrySyncable::UNSYNCABLE_PREF); | 444 PrefRegistrySyncable::UNSYNCABLE_PREF); |
445 registry->RegisterStringPref(prefs::kEnterpriseWebStoreName, | 445 registry->RegisterStringPref(prefs::kEnterpriseWebStoreName, |
446 std::string() /* default_value */, | 446 std::string() /* default_value */, |
447 PrefRegistrySyncable::UNSYNCABLE_PREF); | 447 PrefRegistrySyncable::UNSYNCABLE_PREF); |
448 } | 448 } |
449 | 449 |
450 } // namespace extensions | 450 } // namespace extensions |
OLD | NEW |