diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 19:41:09 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 19:41:09 +0000 |
| commit | a945841f6a3c2adcabe2a830f0c9e0b18e1574ac (patch) | |
| tree | 1cd7c14dea0b982d1869dbc5c4a280e3875b4734 /chrome/browser/importer/firefox2_importer.cc | |
| parent | 162b5998f0e5caa333d9f348207b7f5a649f8eac (diff) | |
| download | chromium_src-a945841f6a3c2adcabe2a830f0c9e0b18e1574ac.zip chromium_src-a945841f6a3c2adcabe2a830f0c9e0b18e1574ac.tar.gz chromium_src-a945841f6a3c2adcabe2a830f0c9e0b18e1574ac.tar.bz2 | |
fav icon -> favicon. Pass 9: chrome/browser/history
BUG=76073
TEST=none; no visible change
Review URL: http://codereview.chromium.org/6696027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer/firefox2_importer.cc')
| -rw-r--r-- | chrome/browser/importer/firefox2_importer.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc index d180ea1..bf2f128 100644 --- a/chrome/browser/importer/firefox2_importer.cc +++ b/chrome/browser/importer/firefox2_importer.cc @@ -144,7 +144,7 @@ void Firefox2Importer::ImportBookmarksFile( Importer* importer, std::vector<ProfileWriter::BookmarkEntry>* bookmarks, std::vector<TemplateURL*>* template_urls, - std::vector<history::ImportedFavIconUsage>* favicons) { + std::vector<history::ImportedFaviconUsage>* favicons) { std::string content; file_util::ReadFileToString(file_path, &content); std::vector<std::string> lines; @@ -289,7 +289,7 @@ void Firefox2Importer::ImportBookmarks() { // Parse the bookmarks.html file. std::vector<ProfileWriter::BookmarkEntry> bookmarks, toolbar_bookmarks; std::vector<TemplateURL*> template_urls; - std::vector<history::ImportedFavIconUsage> favicons; + std::vector<history::ImportedFaviconUsage> favicons; FilePath file = source_path_; if (!parsing_bookmarks_html_file_) file = file.AppendASCII("bookmarks.html"); @@ -654,7 +654,7 @@ void Firefox2Importer::FindXMLFilesInDir( void Firefox2Importer::DataURLToFaviconUsage( const GURL& link_url, const GURL& favicon_data, - std::vector<history::ImportedFavIconUsage>* favicons) { + std::vector<history::ImportedFaviconUsage>* favicons) { if (!link_url.is_valid() || !favicon_data.is_valid() || !favicon_data.SchemeIs(chrome::kDataScheme)) return; @@ -665,7 +665,7 @@ void Firefox2Importer::DataURLToFaviconUsage( data.empty()) return; - history::ImportedFavIconUsage usage; + history::ImportedFaviconUsage usage; if (!ReencodeFavicon(reinterpret_cast<const unsigned char*>(&data[0]), data.size(), &usage.png_data)) return; // Unable to decode. |