Commit 3d5ea95e authored by Michael van Ouwerkerk's avatar Michael van Ouwerkerk Committed by Commit Bot

Clean up TODO for larger image limits.

Also, use our own constant so that the limit does not get raised again
without us knowing in the future.

The in-memory limit was recently raised to 5MB:
https://chromium-review.googlesource.com/c/chromium/src/+/1866194

Bug: 1018138
Change-Id: I2ce729203fe418d6eca8a0145d2df36be6c4bc92
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1939707
Commit-Queue: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Reviewed-by: default avatarRichard Knoll <knollr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719569}
parent 6c138bfb
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
#include "url/origin.h" #include "url/origin.h"
namespace { namespace {
constexpr size_t kMaxImageDownloadSize = 5 * 1024 * 1024;
// These values are the 2x of the preferred width and height defined in // These values are the 2x of the preferred width and height defined in
// message_center_constants.h, which are in dip. // message_center_constants.h, which are in dip.
constexpr int kNotificationImageMaxWidthPx = 720; constexpr int kNotificationImageMaxWidthPx = 720;
...@@ -165,13 +167,12 @@ void RemoteCopyMessageHandler::HandleImage(const std::string& image_url) { ...@@ -165,13 +167,12 @@ void RemoteCopyMessageHandler::HandleImage(const std::string& image_url) {
url_loader_ = url_loader_ =
network::SimpleURLLoader::Create(std::move(request), kTrafficAnnotation); network::SimpleURLLoader::Create(std::move(request), kTrafficAnnotation);
timer_ = base::ElapsedTimer(); timer_ = base::ElapsedTimer();
// TODO(mvanouwerkerk): Downloads > 1MB (kMaxBoundedStringDownloadSize).
// Unretained(this) is safe here because |this| owns |url_loader_|. // Unretained(this) is safe here because |this| owns |url_loader_|.
url_loader_->DownloadToString( url_loader_->DownloadToString(
profile_->GetURLLoaderFactory().get(), profile_->GetURLLoaderFactory().get(),
base::BindOnce(&RemoteCopyMessageHandler::OnURLLoadComplete, base::BindOnce(&RemoteCopyMessageHandler::OnURLLoadComplete,
base::Unretained(this)), base::Unretained(this)),
network::SimpleURLLoader::kMaxBoundedStringDownloadSize); kMaxImageDownloadSize);
} }
bool RemoteCopyMessageHandler::IsOriginAllowed(const GURL& image_url) { bool RemoteCopyMessageHandler::IsOriginAllowed(const GURL& image_url) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment