| Index: chrome/browser/installable/installable_manager.cc
|
| diff --git a/chrome/browser/installable/installable_manager.cc b/chrome/browser/installable/installable_manager.cc
|
| index dfd105b1ec8152a7b3a075d065edb925ada4ee58..ba07cb8f60f36c7dd977fcb3831c3eec2b2a27a7 100644
|
| --- a/chrome/browser/installable/installable_manager.cc
|
| +++ b/chrome/browser/installable/installable_manager.cc
|
| @@ -69,40 +69,15 @@ bool IsParamsForPwaCheck(const InstallableParams& params) {
|
|
|
| DEFINE_WEB_CONTENTS_USER_DATA_KEY(InstallableManager);
|
|
|
| -struct InstallableManager::ManifestProperty {
|
| - InstallableStatusCode error = NO_ERROR_DETECTED;
|
| - GURL url;
|
| - content::Manifest manifest;
|
| - bool fetched = false;
|
| -};
|
| -
|
| -struct InstallableManager::ValidManifestProperty {
|
| - InstallableStatusCode error = NO_ERROR_DETECTED;
|
| - bool is_valid = false;
|
| - bool fetched = false;
|
| -};
|
| -
|
| -struct InstallableManager::ServiceWorkerProperty {
|
| - InstallableStatusCode error = NO_ERROR_DETECTED;
|
| - bool has_worker = false;
|
| - bool fetched = false;
|
| -};
|
| -
|
| -struct InstallableManager::IconProperty {
|
| - IconProperty() :
|
| - error(NO_ERROR_DETECTED), url(), icon(), fetched(false) { }
|
| - IconProperty(IconProperty&& other) = default;
|
| - IconProperty& operator=(IconProperty&& other) = default;
|
| -
|
| - InstallableStatusCode error = NO_ERROR_DETECTED;
|
| - GURL url;
|
| - std::unique_ptr<SkBitmap> icon;
|
| - bool fetched;
|
| -
|
| - private:
|
| - // This class contains a std::unique_ptr and therefore must be move-only.
|
| - DISALLOW_COPY_AND_ASSIGN(IconProperty);
|
| -};
|
| +InstallableManager::IconProperty::IconProperty()
|
| + : error(NO_ERROR_DETECTED), url(), icon(), fetched(false) {}
|
| +
|
| +InstallableManager::IconProperty::IconProperty(IconProperty&& other) = default;
|
| +
|
| +InstallableManager::IconProperty::~IconProperty() {}
|
| +
|
| +InstallableManager::IconProperty& InstallableManager::IconProperty::operator=(
|
| + InstallableManager::IconProperty&& other) = default;
|
|
|
| InstallableManager::InstallableManager(content::WebContents* web_contents)
|
| : content::WebContentsObserver(web_contents),
|
|
|