summaryrefslogtreecommitdiffstats
path: root/chrome/browser/history/history.h
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 19:41:09 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 19:41:09 +0000
commita945841f6a3c2adcabe2a830f0c9e0b18e1574ac (patch)
tree1cd7c14dea0b982d1869dbc5c4a280e3875b4734 /chrome/browser/history/history.h
parent162b5998f0e5caa333d9f348207b7f5a649f8eac (diff)
downloadchromium_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/history/history.h')
-rw-r--r--chrome/browser/history/history.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h
index f23c34f..6cbbd66 100644
--- a/chrome/browser/history/history.h
+++ b/chrome/browser/history/history.h
@@ -598,7 +598,6 @@ class HistoryService : public CancelableRequestProvider,
template<typename Info, typename Callback> friend class DownloadRequest;
friend class PageUsageRequest;
friend class RedirectRequest;
- friend class FavIconRequest;
friend class TestingProfile;
// Implementation of NotificationObserver.
@@ -635,7 +634,7 @@ class HistoryService : public CancelableRequestProvider,
// notification (NOTIFY_HISTORY_LOADED) and sets backend_loaded_ to true.
void OnDBLoaded();
- // FavIcon -------------------------------------------------------------------
+ // Favicon -------------------------------------------------------------------
// These favicon methods are exposed to the FaviconService. Instead of calling
// these methods directly you should call the respective method on the
@@ -663,7 +662,7 @@ class HistoryService : public CancelableRequestProvider,
// once. The pages must exist, any favicon sets for unknown pages will be
// discarded. Existing favicons will not be overwritten.
void SetImportedFavicons(
- const std::vector<history::ImportedFavIconUsage>& favicon_usage);
+ const std::vector<history::ImportedFaviconUsage>& favicon_usage);
// Used by the FaviconService to set the favicon for a page on the history
// backend.