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/profile_import | |
| 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/profile_import')
| -rw-r--r-- | chrome/profile_import/profile_import_thread.cc | 8 | ||||
| -rw-r--r-- | chrome/profile_import/profile_import_thread.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/profile_import/profile_import_thread.cc b/chrome/profile_import/profile_import_thread.cc index a7dd12f..938c52d 100644 --- a/chrome/profile_import/profile_import_thread.cc +++ b/chrome/profile_import/profile_import_thread.cc @@ -157,15 +157,15 @@ void ProfileImportThread::NotifyBookmarksImportReady( } void ProfileImportThread::NotifyFavIconsImportReady( - const std::vector<history::ImportedFavIconUsage>& favicons) { + const std::vector<history::ImportedFaviconUsage>& favicons) { Send(new ProfileImportProcessHostMsg_NotifyFavIconsImportStart( favicons.size())); - std::vector<history::ImportedFavIconUsage>::const_iterator it; + std::vector<history::ImportedFaviconUsage>::const_iterator it; for (it = favicons.begin(); it < favicons.end(); it = it + kNumFavIconsToSend) { - std::vector<history::ImportedFavIconUsage> favicons_group; - std::vector<history::ImportedFavIconUsage>::const_iterator end_group = + std::vector<history::ImportedFaviconUsage> favicons_group; + std::vector<history::ImportedFaviconUsage>::const_iterator end_group = std::min(it + kNumFavIconsToSend, favicons.end()); favicons_group.assign(it, end_group); diff --git a/chrome/profile_import/profile_import_thread.h b/chrome/profile_import/profile_import_thread.h index c3fd7b0..7d726bd 100644 --- a/chrome/profile_import/profile_import_thread.h +++ b/chrome/profile_import/profile_import_thread.h @@ -49,7 +49,7 @@ class ProfileImportThread : public ChildThread { const std::vector<ProfileWriter::BookmarkEntry>& bookmarks, const std::wstring& first_folder_name, int options); void NotifyFavIconsImportReady( - const std::vector<history::ImportedFavIconUsage>& favicons); + const std::vector<history::ImportedFaviconUsage>& favicons); void NotifyPasswordFormReady(const webkit_glue::PasswordForm& form); void NotifyKeywordsReady(const std::vector<TemplateURL*>& template_urls, int default_keyword_index, bool unique_on_host_and_path); |