Skip to content
This repository was archived by the owner on Jan 4, 2019. It is now read-only.

Emit png_data for invalid favicon_url of import from HTML #64

Merged
merged 1 commit into from
Oct 4, 2016
Merged

Emit png_data for invalid favicon_url of import from HTML #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions atom/browser/importer/profile_writer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "atom/common/importer/imported_cookie_entry.h"
#include "atom/common/native_mate_converters/string16_converter.h"
#include "atom/common/native_mate_converters/value_converter.h"
#include "base/base64.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
Expand Down Expand Up @@ -315,11 +316,12 @@ void ProfileWriter::AddFavicons(
base::DictionaryValue* imported_favicon = new base::DictionaryValue();
imported_favicon->SetString("favicon_url",
favicon.favicon_url.possibly_invalid_spec());
/*
imported_favicon->SetString("png_data",
std::string(favicon.png_data.begin(),
favicon.png_data.end()));
*/
std::string data_url;
data_url.insert(data_url.end(), favicon.png_data.begin(),
favicon.png_data.end());
base::Base64Encode(data_url, &data_url);
data_url.insert(0, "data:image/png;base64,");
imported_favicon->SetString("png_data", data_url);
std::set<GURL>::iterator it;
base::ListValue* urls = new base::ListValue();
for (it = favicon.urls.begin(); it != favicon.urls.end(); ++it) {
Expand Down