| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_ | 5 #ifndef CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_ |
| 6 #define CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_ | 6 #define CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_ |
| 7 | 7 |
| 8 #include <list> | 8 #include <list> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 // if the extension is pending from another source which overrides | 73 // if the extension is pending from another source which overrides |
| 74 // sync installs (such as a policy extension) or if the extension | 74 // sync installs (such as a policy extension) or if the extension |
| 75 // is already installed. | 75 // is already installed. |
| 76 // After installation, the extension will be granted permissions iff | 76 // After installation, the extension will be granted permissions iff |
| 77 // |version| is valid and matches the actual installed version. | 77 // |version| is valid and matches the actual installed version. |
| 78 bool AddFromSync( | 78 bool AddFromSync( |
| 79 const std::string& id, | 79 const std::string& id, |
| 80 const GURL& update_url, | 80 const GURL& update_url, |
| 81 const base::Version& version, | 81 const base::Version& version, |
| 82 PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install, | 82 PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install, |
| 83 bool remote_install, | 83 bool remote_install); |
| 84 bool installed_by_custodian); | |
| 85 | 84 |
| 86 // Adds an extension that was depended on by another extension. | 85 // Adds an extension that was depended on by another extension. |
| 87 bool AddFromExtensionImport( | 86 bool AddFromExtensionImport( |
| 88 const std::string& id, | 87 const std::string& id, |
| 89 const GURL& update_url, | 88 const GURL& update_url, |
| 90 PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install); | 89 PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install); |
| 91 | 90 |
| 92 // Given an extension id and an update URL, schedule the extension | 91 // Given an extension id and an update URL, schedule the extension |
| 93 // to be fetched, installed, and activated. | 92 // to be fetched, installed, and activated. |
| 94 bool AddFromExternalUpdateUrl(const std::string& id, | 93 bool AddFromExternalUpdateUrl(const std::string& id, |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 friend void SetupPendingExtensionManagerForTest( | 146 friend void SetupPendingExtensionManagerForTest( |
| 148 int count, const GURL& update_url, | 147 int count, const GURL& update_url, |
| 149 PendingExtensionManager* pending_extension_manager); | 148 PendingExtensionManager* pending_extension_manager); |
| 150 | 149 |
| 151 DISALLOW_COPY_AND_ASSIGN(PendingExtensionManager); | 150 DISALLOW_COPY_AND_ASSIGN(PendingExtensionManager); |
| 152 }; | 151 }; |
| 153 | 152 |
| 154 } // namespace extensions | 153 } // namespace extensions |
| 155 | 154 |
| 156 #endif // CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_ | 155 #endif // CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_ |
| OLD | NEW |