Chromium Code Reviews| Index: chrome/browser/ui/webui/fallback_icon_source.cc |
| diff --git a/chrome/browser/ui/webui/fallback_icon_source.cc b/chrome/browser/ui/webui/fallback_icon_source.cc |
| index 78eae81ba79ec1e8721db6c977891c3795402c98..6cd2b026bc59d8c88bd5c8143d230e5181cf806b 100644 |
| --- a/chrome/browser/ui/webui/fallback_icon_source.cc |
| +++ b/chrome/browser/ui/webui/fallback_icon_source.cc |
| @@ -15,6 +15,7 @@ |
| #include "net/url_request/url_request.h" |
| #include "ui/base/l10n/l10n_util.h" |
| #include "ui/gfx/favicon_size.h" |
| +#include "url/gurl.h" |
| FallbackIconSource::FallbackIconSource() { |
| std::vector<std::string> font_list; |
| @@ -47,8 +48,11 @@ void FallbackIconSource::StartDataRequest( |
| SendDefaultResponse(callback); |
| return; |
| } |
| - |
| - GURL url(parsed.url()); |
| + GURL url(parsed.url_string()); |
| + if (!url.is_empty() && !url.is_valid()) { |
|
beaudoin
2015/03/18 00:05:38
A short comment like:
// Ensure URL is empty or va
huangs
2015/03/18 18:38:49
The original reason was that I want to render the
beaudoin
2015/03/18 19:03:18
Acknowledged.
|
| + SendDefaultResponse(callback); |
| + return; |
| + } |
| std::vector<unsigned char> bitmap_data = |
| fallback_icon_service_->RenderFallbackIconBitmap( |
| url, parsed.size_in_pixels(), parsed.style()); |