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" |
11 #include "base/files/file_path.h" | 11 #include "base/files/file_path.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #include "base/memory/linked_ptr.h" | 13 #include "base/memory/linked_ptr.h" |
14 #include "base/metrics/field_trial.h" | 14 #include "base/metrics/field_trial.h" |
15 #include "base/path_service.h" | 15 #include "base/path_service.h" |
16 #include "base/string_util.h" | 16 #include "base/string_util.h" |
17 #include "base/values.h" | 17 #include "base/values.h" |
18 #include "base/version.h" | 18 #include "base/version.h" |
19 #include "chrome/browser/app_mode/app_mode_utils.h" | 19 #include "chrome/browser/app_mode/app_mode_utils.h" |
20 #include "chrome/browser/browser_process.h" | 20 #include "chrome/browser/browser_process.h" |
21 #include "chrome/browser/extensions/extension_service.h" | 21 #include "chrome/browser/extensions/extension_service.h" |
22 #include "chrome/browser/extensions/external_component_loader.h" | |
22 #include "chrome/browser/extensions/external_policy_loader.h" | 23 #include "chrome/browser/extensions/external_policy_loader.h" |
23 #include "chrome/browser/extensions/external_pref_loader.h" | 24 #include "chrome/browser/extensions/external_pref_loader.h" |
24 #include "chrome/browser/extensions/external_provider_interface.h" | 25 #include "chrome/browser/extensions/external_provider_interface.h" |
25 #include "chrome/browser/profiles/profile.h" | 26 #include "chrome/browser/profiles/profile.h" |
26 #include "chrome/common/chrome_paths.h" | 27 #include "chrome/common/chrome_paths.h" |
27 #include "chrome/common/chrome_switches.h" | 28 #include "chrome/common/chrome_switches.h" |
28 #include "chrome/common/extensions/extension.h" | 29 #include "chrome/common/extensions/extension.h" |
29 #include "chrome/common/extensions/manifest.h" | 30 #include "chrome/common/extensions/manifest.h" |
30 #include "chrome/common/pref_names.h" | 31 #include "chrome/common/pref_names.h" |
31 #include "content/public/browser/browser_thread.h" | 32 #include "content/public/browser/browser_thread.h" |
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
451 linked_ptr<ExternalProviderInterface>( | 452 linked_ptr<ExternalProviderInterface>( |
452 new ExternalProviderImpl( | 453 new ExternalProviderImpl( |
453 service, | 454 service, |
454 connector->GetAppPackUpdater()->CreateExternalLoader(), | 455 connector->GetAppPackUpdater()->CreateExternalLoader(), |
455 Manifest::EXTERNAL_PREF, | 456 Manifest::EXTERNAL_PREF, |
456 Manifest::INVALID_LOCATION, | 457 Manifest::INVALID_LOCATION, |
457 Extension::NO_FLAGS))); | 458 Extension::NO_FLAGS))); |
458 } | 459 } |
459 #endif | 460 #endif |
460 } | 461 } |
462 | |
463 provider_list->push_back( | |
Dmitry Polukhin
2013/08/14 19:39:12
FYI, I'm going to move this provider under "if (!i
| |
464 linked_ptr<ExternalProviderInterface>( | |
465 new ExternalProviderImpl( | |
466 service, | |
467 new ExternalComponentLoader(), | |
468 Manifest::INVALID_LOCATION, | |
469 Manifest::EXTERNAL_POLICY_DOWNLOAD, | |
Mattias Nissler (ping if slow)
2013/09/05 08:19:06
Is the EXTERNAL_POLICY_DOWNLOAD location intention
asargent_no_longer_on_chrome
2013/09/05 21:19:16
Whether it was intentional or not, it is incorrect
| |
470 Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT))); | |
461 } | 471 } |
462 | 472 |
463 } // namespace extensions | 473 } // namespace extensions |
OLD | NEW |