diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-17 00:18:44 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-17 00:18:44 +0000 |
commit | ab3eaeed083df5b92270b6e7a0450828ab4f9e14 (patch) | |
tree | 92ff16caa7edef5074bafd383fd9435b6edb5518 /chrome/browser | |
parent | 289126ff4fb0ec70a13e375934d543bf4090b7e3 (diff) | |
download | chromium_src-ab3eaeed083df5b92270b6e7a0450828ab4f9e14.zip chromium_src-ab3eaeed083df5b92270b6e7a0450828ab4f9e14.tar.gz chromium_src-ab3eaeed083df5b92270b6e7a0450828ab4f9e14.tar.bz2 |
components: Move visitedlink into visitedlink namespace.
BUG=238223
R=joi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/14884016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/history/history_backend.cc | 2 | ||||
-rw-r--r-- | chrome/browser/history/history_backend.h | 2 | ||||
-rw-r--r-- | chrome/browser/history/history_service.cc | 4 | ||||
-rw-r--r-- | chrome/browser/history/history_service.h | 11 |
4 files changed, 9 insertions, 10 deletions
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc index 17f996c..9a63957 100644 --- a/chrome/browser/history/history_backend.cc +++ b/chrome/browser/history/history_backend.cc @@ -1085,7 +1085,7 @@ void HistoryBackend::AddPageNoVisitForBookmark(const GURL& url, } void HistoryBackend::IterateURLs( - const scoped_refptr<components::VisitedLinkDelegate::URLEnumerator>& + const scoped_refptr<visitedlink::VisitedLinkDelegate::URLEnumerator>& iterator) { if (db_) { HistoryDatabase::URLEnumerator e; diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h index 5a9fe9a..ff75904 100644 --- a/chrome/browser/history/history_backend.h +++ b/chrome/browser/history/history_backend.h @@ -175,7 +175,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>, HistoryURLProviderParams* params); void IterateURLs( - const scoped_refptr<components::VisitedLinkDelegate::URLEnumerator>& + const scoped_refptr<visitedlink::VisitedLinkDelegate::URLEnumerator>& enumerator); void QueryURL(scoped_refptr<QueryURLRequest> request, const GURL& url, diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc index c95529e9..ccb0b99 100644 --- a/chrome/browser/history/history_service.cc +++ b/chrome/browser/history/history_service.cc @@ -96,7 +96,7 @@ void RunWithFaviconResults( // Extract history::URLRows into GURLs for VisitedLinkMaster. class URLIteratorFromURLRows - : public components::VisitedLinkMaster::URLIterator { + : public visitedlink::VisitedLinkMaster::URLIterator { public: explicit URLIteratorFromURLRows(const history::URLRows& url_rows) : itr_(url_rows.begin()), @@ -223,7 +223,7 @@ HistoryService::HistoryService(Profile* profile) : weak_ptr_factory_(this), thread_(new base::Thread(kHistoryThreadName)), profile_(profile), - visitedlink_master_(new components::VisitedLinkMaster( + visitedlink_master_(new visitedlink::VisitedLinkMaster( profile, this, true)), backend_loaded_(false), current_backend_id_(-1), diff --git a/chrome/browser/history/history_service.h b/chrome/browser/history/history_service.h index 40264be..4e1ceda 100644 --- a/chrome/browser/history/history_service.h +++ b/chrome/browser/history/history_service.h @@ -54,10 +54,9 @@ class FilePath; class Thread; } -namespace components { +namespace visitedlink { class VisitedLinkMaster; -} // namespace components - +} namespace history { @@ -86,7 +85,7 @@ class HistoryService : public CancelableRequestProvider, public content::NotificationObserver, public syncer::SyncableService, public ProfileKeyedService, - public components::VisitedLinkDelegate { + public visitedlink::VisitedLinkDelegate { public: // Miscellaneous commonly-used types. typedef std::vector<PageUsageData*> PageUsageDataList; @@ -657,7 +656,7 @@ class HistoryService : public CancelableRequestProvider, const content::NotificationSource& source, const content::NotificationDetails& details) OVERRIDE; - // Implementation of components::VisitedLinkDelegate. + // Implementation of visitedlink::VisitedLinkDelegate. virtual void RebuildTable( const scoped_refptr<URLEnumerator>& enumerator) OVERRIDE; @@ -1068,7 +1067,7 @@ class HistoryService : public CancelableRequestProvider, // Used for propagating link highlighting data across renderers. May be null // in tests. - scoped_ptr<components::VisitedLinkMaster> visitedlink_master_; + scoped_ptr<visitedlink::VisitedLinkMaster> visitedlink_master_; // Has the backend finished loading? The backend is loaded once Init has // completed. |