diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 18:54:05 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 18:54:05 +0000 |
| commit | f16039d23043cf97048540b3916be44825697f9b (patch) | |
| tree | 4f607808a77397f26cbca4935b5996abdc188796 /chrome/profile_import | |
| parent | f660caef294d1ad42142b8a500da4ea49af2a4bf (diff) | |
| download | chromium_src-f16039d23043cf97048540b3916be44825697f9b.zip chromium_src-f16039d23043cf97048540b3916be44825697f9b.tar.gz chromium_src-f16039d23043cf97048540b3916be44825697f9b.tar.bz2 | |
fav icon -> favicon. Pass 12/12: all the rest
BUG=76073
TEST=test; no visible change
Review URL: http://codereview.chromium.org/6667044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/profile_import')
| -rw-r--r-- | chrome/profile_import/profile_import_thread.cc | 12 | ||||
| -rw-r--r-- | chrome/profile_import/profile_import_thread.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/chrome/profile_import/profile_import_thread.cc b/chrome/profile_import/profile_import_thread.cc index 938c52d..4a3003c 100644 --- a/chrome/profile_import/profile_import_thread.cc +++ b/chrome/profile_import/profile_import_thread.cc @@ -21,7 +21,7 @@ namespace { // oversized IPC messages. const int kNumBookmarksToSend = 100; const int kNumHistoryRowsToSend = 100; -const int kNumFavIconsToSend = 100; +const int kNumFaviconsToSend = 100; } ProfileImportThread::ProfileImportThread() @@ -156,20 +156,20 @@ void ProfileImportThread::NotifyBookmarksImportReady( } } -void ProfileImportThread::NotifyFavIconsImportReady( +void ProfileImportThread::NotifyFaviconsImportReady( const std::vector<history::ImportedFaviconUsage>& favicons) { - Send(new ProfileImportProcessHostMsg_NotifyFavIconsImportStart( + Send(new ProfileImportProcessHostMsg_NotifyFaviconsImportStart( favicons.size())); std::vector<history::ImportedFaviconUsage>::const_iterator it; for (it = favicons.begin(); it < favicons.end(); - it = it + kNumFavIconsToSend) { + it = it + kNumFaviconsToSend) { std::vector<history::ImportedFaviconUsage> favicons_group; std::vector<history::ImportedFaviconUsage>::const_iterator end_group = - std::min(it + kNumFavIconsToSend, favicons.end()); + std::min(it + kNumFaviconsToSend, favicons.end()); favicons_group.assign(it, end_group); - Send(new ProfileImportProcessHostMsg_NotifyFavIconsImportGroup( + Send(new ProfileImportProcessHostMsg_NotifyFaviconsImportGroup( favicons_group)); } } diff --git a/chrome/profile_import/profile_import_thread.h b/chrome/profile_import/profile_import_thread.h index 7d726bd..59930d9 100644 --- a/chrome/profile_import/profile_import_thread.h +++ b/chrome/profile_import/profile_import_thread.h @@ -48,7 +48,7 @@ class ProfileImportThread : public ChildThread { void NotifyBookmarksImportReady( const std::vector<ProfileWriter::BookmarkEntry>& bookmarks, const std::wstring& first_folder_name, int options); - void NotifyFavIconsImportReady( + void NotifyFaviconsImportReady( const std::vector<history::ImportedFaviconUsage>& favicons); void NotifyPasswordFormReady(const webkit_glue::PasswordForm& form); void NotifyKeywordsReady(const std::vector<TemplateURL*>& template_urls, |