From 6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Wed, 19 Oct 2011 02:52:53 +0000 Subject: Move NotificationObserver, NotificationSource, and NotificationDetails to content/public/browser. This patch got way bigger than I wanted, but once I moved NotificationDetails, I figured I might as well mvoe the others since they're in the same files. In hindsight, I should have converted a subset of files at a time by leaving a using statement in the header. BUG=98716 TBR=joi git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106196 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/appcache/chrome_appcache_service.cc | 7 ++++--- content/browser/appcache/chrome_appcache_service.h | 14 +++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'content/browser/appcache') diff --git a/content/browser/appcache/chrome_appcache_service.cc b/content/browser/appcache/chrome_appcache_service.cc index 0923c94..72fa620 100644 --- a/content/browser/appcache/chrome_appcache_service.cc +++ b/content/browser/appcache/chrome_appcache_service.cc @@ -56,9 +56,10 @@ bool ChromeAppCacheService::CanCreateAppCache( manifest_url, first_party, *resource_context_); } -void ChromeAppCacheService::Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { +void ChromeAppCacheService::Observe( + int type, + const content::NotificationSource& source, + const content::NotificationDetails& details) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); DCHECK(type == content::NOTIFICATION_PURGE_MEMORY); PurgeMemory(); diff --git a/content/browser/appcache/chrome_appcache_service.h b/content/browser/appcache/chrome_appcache_service.h index a599517..e5f73e1 100644 --- a/content/browser/appcache/chrome_appcache_service.h +++ b/content/browser/appcache/chrome_appcache_service.h @@ -10,8 +10,8 @@ #include "base/memory/ref_counted.h" #include "content/browser/browser_thread.h" #include "content/common/content_export.h" -#include "content/common/notification_observer.h" -#include "content/common/notification_registrar.h" +#include "content/public/browser/notification_observer.h" +#include "content/public/browser/notification_registrar.h" #include "webkit/appcache/appcache_policy.h" #include "webkit/appcache/appcache_service.h" #include "webkit/quota/special_storage_policy.h" @@ -38,7 +38,7 @@ class CONTENT_EXPORT ChromeAppCacheService BrowserThread::DeleteOnIOThread>, NON_EXPORTED_BASE(public appcache::AppCacheService), NON_EXPORTED_BASE(public appcache::AppCachePolicy), - public NotificationObserver { + public content::NotificationObserver { public: explicit ChromeAppCacheService(quota::QuotaManagerProxy* proxy); @@ -61,13 +61,13 @@ class CONTENT_EXPORT ChromeAppCacheService virtual bool CanCreateAppCache(const GURL& manifest_url, const GURL& first_party); - // NotificationObserver override + // content::NotificationObserver override virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); const content::ResourceContext* resource_context_; - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; FilePath cache_path_; DISALLOW_COPY_AND_ASSIGN(ChromeAppCacheService); -- cgit v1.1