diff options
| author | kkanetkar@chromium.org <kkanetkar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-28 03:14:37 +0000 |
|---|---|---|
| committer | kkanetkar@chromium.org <kkanetkar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-28 03:14:37 +0000 |
| commit | ec5c192817606b55ad99edb256997b70eea41b85 (patch) | |
| tree | 16e863d9b1fa02f029c050b028177b7c984da6eb /chrome/browser | |
| parent | 16d35b25ec19b82c13dc7cd24f744951cc12fad0 (diff) | |
| download | chromium_src-ec5c192817606b55ad99edb256997b70eea41b85.zip chromium_src-ec5c192817606b55ad99edb256997b70eea41b85.tar.gz chromium_src-ec5c192817606b55ad99edb256997b70eea41b85.tar.bz2 | |
Chrome side of changes required to populate appcache resource list.
BUG = 2821005
TEST = Manually navigate.
Review URL: http://codereview.chromium.org/3009005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
5 files changed, 21 insertions, 18 deletions
diff --git a/chrome/browser/appcache/appcache_dispatcher_host.cc b/chrome/browser/appcache/appcache_dispatcher_host.cc index b3a7bb0..e37784f 100644 --- a/chrome/browser/appcache/appcache_dispatcher_host.cc +++ b/chrome/browser/appcache/appcache_dispatcher_host.cc @@ -61,6 +61,7 @@ bool AppCacheDispatcherHost::OnMessageReceived(const IPC::Message& msg, IPC_BEGIN_MESSAGE_MAP_EX(AppCacheDispatcherHost, msg, *msg_ok) IPC_MESSAGE_HANDLER(AppCacheMsg_RegisterHost, OnRegisterHost); IPC_MESSAGE_HANDLER(AppCacheMsg_UnregisterHost, OnUnregisterHost); + IPC_MESSAGE_HANDLER(AppCacheMsg_GetResourceList, OnGetResourceList); IPC_MESSAGE_HANDLER(AppCacheMsg_SelectCache, OnSelectCache); IPC_MESSAGE_HANDLER(AppCacheMsg_SelectCacheForWorker, OnSelectCacheForWorker); @@ -102,8 +103,7 @@ void AppCacheDispatcherHost::OnSelectCache( ReceivedBadMessage(AppCacheMsg_SelectCache::ID); } } else { - frontend_proxy_.OnCacheSelected( - host_id, appcache::kNoCacheId, appcache::UNCACHED); + frontend_proxy_.OnCacheSelected(host_id, appcache::AppCacheInfo()); } } @@ -115,8 +115,7 @@ void AppCacheDispatcherHost::OnSelectCacheForWorker( ReceivedBadMessage(AppCacheMsg_SelectCacheForWorker::ID); } } else { - frontend_proxy_.OnCacheSelected( - host_id, appcache::kNoCacheId, appcache::UNCACHED); + frontend_proxy_.OnCacheSelected(host_id, appcache::AppCacheInfo()); } } @@ -126,8 +125,7 @@ void AppCacheDispatcherHost::OnSelectCacheForSharedWorker( if (!backend_impl_.SelectCacheForSharedWorker(host_id, appcache_id)) ReceivedBadMessage(AppCacheMsg_SelectCacheForSharedWorker::ID); } else { - frontend_proxy_.OnCacheSelected( - host_id, appcache::kNoCacheId, appcache::UNCACHED); + frontend_proxy_.OnCacheSelected(host_id, appcache::AppCacheInfo()); } } @@ -142,6 +140,12 @@ void AppCacheDispatcherHost::OnMarkAsForeignEntry( } } +void AppCacheDispatcherHost::OnGetResourceList( + int host_id, std::vector<appcache::AppCacheResourceInfo>* params) { + if (appcache_service_.get()) + backend_impl_.GetResourceList(host_id, params); +} + void AppCacheDispatcherHost::OnGetStatus(int host_id, IPC::Message* reply_msg) { if (pending_reply_msg_.get()) { diff --git a/chrome/browser/appcache/appcache_dispatcher_host.h b/chrome/browser/appcache/appcache_dispatcher_host.h index ceb0528..c54784c 100644 --- a/chrome/browser/appcache/appcache_dispatcher_host.h +++ b/chrome/browser/appcache/appcache_dispatcher_host.h @@ -59,7 +59,9 @@ class AppCacheDispatcherHost { void OnGetStatus(int host_id, IPC::Message* reply_msg); void OnStartUpdate(int host_id, IPC::Message* reply_msg); void OnSwapCache(int host_id, IPC::Message* reply_msg); - + void OnGetResourceList( + int host_id, + std::vector<appcache::AppCacheResourceInfo>* resource_infos); void GetStatusCallback(appcache::Status status, void* param); void StartUpdateCallback(bool result, void* param); void SwapCacheCallback(bool result, void* param); diff --git a/chrome/browser/appcache/appcache_frontend_proxy.cc b/chrome/browser/appcache/appcache_frontend_proxy.cc index 78ec85d..0a80424 100644 --- a/chrome/browser/appcache/appcache_frontend_proxy.cc +++ b/chrome/browser/appcache/appcache_frontend_proxy.cc @@ -6,9 +6,9 @@ #include "chrome/common/render_messages.h" -void AppCacheFrontendProxy::OnCacheSelected(int host_id, int64 cache_id , - appcache::Status status) { - sender_->Send(new AppCacheMsg_CacheSelected(host_id, cache_id, status)); +void AppCacheFrontendProxy::OnCacheSelected( + int host_id, const appcache::AppCacheInfo& info) { + sender_->Send(new AppCacheMsg_CacheSelected(host_id, info)); } void AppCacheFrontendProxy::OnStatusChanged(const std::vector<int>& host_ids, diff --git a/chrome/browser/appcache/appcache_frontend_proxy.h b/chrome/browser/appcache/appcache_frontend_proxy.h index c23eeca9..2d3775c 100644 --- a/chrome/browser/appcache/appcache_frontend_proxy.h +++ b/chrome/browser/appcache/appcache_frontend_proxy.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_APPCACHE_APPCACHE_FRONTEND_PROXY_H_ #pragma once +#include <string> #include <vector> #include "ipc/ipc_message.h" @@ -19,8 +20,7 @@ class AppCacheFrontendProxy : public appcache::AppCacheFrontend { IPC::Message::Sender* sender() const { return sender_; } // AppCacheFrontend methods - virtual void OnCacheSelected(int host_id, int64 cache_id , - appcache::Status); + virtual void OnCacheSelected(int host_id, const appcache::AppCacheInfo& info); virtual void OnStatusChanged(const std::vector<int>& host_ids, appcache::Status status); virtual void OnEventRaised(const std::vector<int>& host_ids, diff --git a/chrome/browser/browsing_data_appcache_helper.cc b/chrome/browser/browsing_data_appcache_helper.cc index 3ce7106..2e58c6b 100644 --- a/chrome/browser/browsing_data_appcache_helper.cc +++ b/chrome/browser/browsing_data_appcache_helper.cc @@ -118,12 +118,9 @@ void CannedBrowsingDataAppCacheHelper::AddAppCache(const GURL& manifest_url) { return; } - appcache_infos_.push_back( - appcache::AppCacheInfo(manifest_url, - 0, - base::Time(), - base::Time(), - base::Time())); + appcache::AppCacheInfo info; + info.manifest_url = manifest_url; + appcache_infos_.push_back(info); } void CannedBrowsingDataAppCacheHelper::Reset() { |