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/bookmarks | |
| 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/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_html_writer_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_model.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc index e7b2a6c..88377f8 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc @@ -227,7 +227,7 @@ TEST_F(BookmarkHTMLWriterTest, Test) { // Read the bookmarks back in. std::vector<ProfileWriter::BookmarkEntry> parsed_bookmarks; - std::vector<history::ImportedFavIconUsage> favicons; + std::vector<history::ImportedFaviconUsage> favicons; Firefox2Importer::ImportBookmarksFile(path_, std::set<GURL>(), false, L"x", NULL, &parsed_bookmarks, NULL, &favicons); diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index a1fb852..a81950d 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -785,7 +785,7 @@ void BookmarkModel::Observe(NotificationType type, switch (type.value) { case NotificationType::FAVICON_CHANGED: { // Prevent the observers from getting confused for multiple favicon loads. - Details<history::FavIconChangeDetails> favicon_details(details); + Details<history::FaviconChangeDetails> favicon_details(details); for (std::set<GURL>::const_iterator i = favicon_details->urls.begin(); i != favicon_details->urls.end(); ++i) { std::vector<const BookmarkNode*> nodes; |