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/external_provider_impl.h" | 5 #include "chrome/browser/extensions/external_provider_impl.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
387 NOTREACHED(); | 387 NOTREACHED(); |
388 } | 388 } |
389 } else { | 389 } else { |
390 external_loader = new ExternalPolicyLoader(profile); | 390 external_loader = new ExternalPolicyLoader(profile); |
391 } | 391 } |
392 #else | 392 #else |
393 external_loader = new ExternalPolicyLoader(profile); | 393 external_loader = new ExternalPolicyLoader(profile); |
394 #endif | 394 #endif |
395 | 395 |
396 // Policies are mandatory so they can't be skipped with command line flag. | 396 // Policies are mandatory so they can't be skipped with command line flag. |
397 if (external_loader) { | 397 if (external_loader.get()) { |
398 provider_list->push_back( | 398 provider_list->push_back( |
399 linked_ptr<ExternalProviderInterface>( | 399 linked_ptr<ExternalProviderInterface>( |
400 new ExternalProviderImpl( | 400 new ExternalProviderImpl( |
401 service, | 401 service, |
402 external_loader, | 402 external_loader, |
403 profile, | 403 profile, |
404 crx_location, | 404 crx_location, |
405 Manifest::EXTERNAL_POLICY_DOWNLOAD, | 405 Manifest::EXTERNAL_POLICY_DOWNLOAD, |
406 Extension::NO_FLAGS))); | 406 Extension::NO_FLAGS))); |
407 } | 407 } |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
574 service, | 574 service, |
575 new ExternalComponentLoader(profile), | 575 new ExternalComponentLoader(profile), |
576 profile, | 576 profile, |
577 Manifest::INVALID_LOCATION, | 577 Manifest::INVALID_LOCATION, |
578 Manifest::EXTERNAL_COMPONENT, | 578 Manifest::EXTERNAL_COMPONENT, |
579 Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT))); | 579 Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT))); |
580 } | 580 } |
581 } | 581 } |
582 | 582 |
583 } // namespace extensions | 583 } // namespace extensions |
OLD | NEW |