| Index: content/public/common/manifest.cc
|
| diff --git a/content/public/common/manifest.cc b/content/public/common/manifest.cc
|
| index 8e09aad2e71ea9aa86f681d7df267f2dbbddb09c..166c268e928fc6a55346796de9209e000baf3504 100644
|
| --- a/content/public/common/manifest.cc
|
| +++ b/content/public/common/manifest.cc
|
| @@ -14,22 +14,23 @@ const int64_t Manifest::kInvalidOrMissingColor =
|
| static_cast<int64_t>(std::numeric_limits<int32_t>::max()) + 1;
|
| const size_t Manifest::kMaxIPCStringLength = 4 * 1024;
|
|
|
| -Manifest::Icon::Icon() { }
|
| +Manifest::Icon::Icon() = default;
|
|
|
| Manifest::Icon::Icon(const Icon& other) = default;
|
|
|
| -Manifest::Icon::~Icon() {
|
| -}
|
| +Manifest::Icon::~Icon() = default;
|
|
|
| bool Manifest::Icon::operator==(const Manifest::Icon& other) const {
|
| return src == other.src && type == other.type && sizes == other.sizes;
|
| }
|
|
|
| -Manifest::RelatedApplication::RelatedApplication() {
|
| -}
|
| +Manifest::ShareTarget::ShareTarget() = default;
|
|
|
| -Manifest::RelatedApplication::~RelatedApplication() {
|
| -}
|
| +Manifest::ShareTarget::~ShareTarget() = default;
|
| +
|
| +Manifest::RelatedApplication::RelatedApplication() = default;
|
| +
|
| +Manifest::RelatedApplication::~RelatedApplication() = default;
|
|
|
| Manifest::Manifest()
|
| : display(blink::WebDisplayModeUndefined),
|
| @@ -37,12 +38,12 @@ Manifest::Manifest()
|
| prefer_related_applications(false),
|
| theme_color(Manifest::kInvalidOrMissingColor),
|
| background_color(Manifest::kInvalidOrMissingColor) {
|
| + share_target = base::nullopt;
|
| }
|
|
|
| Manifest::Manifest(const Manifest& other) = default;
|
|
|
| -Manifest::~Manifest() {
|
| -}
|
| +Manifest::~Manifest() = default;
|
|
|
| bool Manifest::IsEmpty() const {
|
| return name.is_null() &&
|
| @@ -51,6 +52,7 @@ bool Manifest::IsEmpty() const {
|
| display == blink::WebDisplayModeUndefined &&
|
| orientation == blink::WebScreenOrientationLockDefault &&
|
| icons.empty() &&
|
| + !share_target.has_value() &&
|
| related_applications.empty() &&
|
| !prefer_related_applications &&
|
| theme_color == Manifest::kInvalidOrMissingColor &&
|
|
|