diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 18:44:52 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 18:44:52 +0000 |
commit | 7a91c555f3e057f8be9010a4e5385678ce822c28 (patch) | |
tree | edb8a4384b09b3ce70b6b58a17afe5470eb5e039 /content/browser/cert_store_impl.cc | |
parent | e2e22a7ab44c2f49d856a9f840893c5462f52679 (diff) | |
download | chromium_src-7a91c555f3e057f8be9010a4e5385678ce822c28.zip chromium_src-7a91c555f3e057f8be9010a4e5385678ce822c28.tar.gz chromium_src-7a91c555f3e057f8be9010a4e5385678ce822c28.tar.bz2 |
content/browser: Move more files into the content namespace.
Fixed most of the files found with the following command line:
$ git grep --files-without-match --name-only "namespace content {" -- content/browser/{*.cc,*.h.*.mm}
R=jam@chromium.org
Review URL: https://codereview.chromium.org/11274038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164120 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/cert_store_impl.cc')
-rw-r--r-- | content/browser/cert_store_impl.cc | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/content/browser/cert_store_impl.cc b/content/browser/cert_store_impl.cc index e17e33a..877c1e4 100644 --- a/content/browser/cert_store_impl.cc +++ b/content/browser/cert_store_impl.cc @@ -15,6 +15,10 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +namespace content { + +namespace { + template <typename T> struct MatchSecond { explicit MatchSecond(const T& t) : value(t) {} @@ -26,8 +30,10 @@ struct MatchSecond { T value; }; +} // namespace + // static -content::CertStore* content::CertStore::GetInstance() { +CertStore* CertStore::GetInstance() { return CertStoreImpl::GetInstance(); } @@ -37,11 +43,10 @@ CertStoreImpl* CertStoreImpl::GetInstance() { } CertStoreImpl::CertStoreImpl() : next_cert_id_(1) { - if (content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) { + if (BrowserThread::CurrentlyOn(BrowserThread::UI)) { RegisterForNotification(); } else { - content::BrowserThread::PostTask( - content::BrowserThread::UI, FROM_HERE, + BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(&CertStoreImpl::RegisterForNotification, base::Unretained(this))); } @@ -57,10 +62,10 @@ void CertStoreImpl::RegisterForNotification() { // removed from cache, and remove the cert when we know it // is not used anymore. - registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED, - content::NotificationService::AllBrowserContextsAndSources()); - registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED, - content::NotificationService::AllBrowserContextsAndSources()); + registrar_.Add(this, NOTIFICATION_RENDERER_PROCESS_TERMINATED, + NotificationService::AllBrowserContextsAndSources()); + registrar_.Add(this, NOTIFICATION_RENDERER_PROCESS_CLOSED, + NotificationService::AllBrowserContextsAndSources()); } int CertStoreImpl::StoreCert(net::X509Certificate* cert, int process_id) { @@ -168,12 +173,13 @@ void CertStoreImpl::RemoveCertsForRenderProcesHost(int process_id) { } void CertStoreImpl::Observe(int type, - const content::NotificationSource& source, - const content::NotificationDetails& details) { - DCHECK(type == content::NOTIFICATION_RENDERER_PROCESS_TERMINATED || - type == content::NOTIFICATION_RENDERER_PROCESS_CLOSED); - content::RenderProcessHost* rph = - content::Source<content::RenderProcessHost>(source).ptr(); + const NotificationSource& source, + const NotificationDetails& details) { + DCHECK(type == NOTIFICATION_RENDERER_PROCESS_TERMINATED || + type == NOTIFICATION_RENDERER_PROCESS_CLOSED); + RenderProcessHost* rph = Source<RenderProcessHost>(source).ptr(); DCHECK(rph); RemoveCertsForRenderProcesHost(rph->GetID()); } + +} // namespace content |