AppCache Internals

From 493d192f856567f441b2a8b436b9fb7ddfdbd4ad Mon Sep 17 00:00:00 2001 From: "kkanetkar@chromium.org" Date: Fri, 2 Apr 2010 01:46:54 +0000 Subject: Adding disabled appcaches information along with capability of removing appcaches with button clicks. BUG=38463 TEST=Run chrome, navigate to about:appcache-internals, add/view/remove appcaches. Review URL: http://codereview.chromium.org/1576009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43430 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/appcache/view_appcache_internals_job.cc | 133 +++++++++++++++++++++---- webkit/appcache/view_appcache_internals_job.h | 15 +-- 2 files changed, 121 insertions(+), 27 deletions(-) (limited to 'webkit') diff --git a/webkit/appcache/view_appcache_internals_job.cc b/webkit/appcache/view_appcache_internals_job.cc index 49384ac..6cd11a0 100644 --- a/webkit/appcache/view_appcache_internals_job.cc +++ b/webkit/appcache/view_appcache_internals_job.cc @@ -9,24 +9,51 @@ #include "base/utf_string_conversions.h" #include "base/i18n/time_formatting.h" #include "base/string_util.h" +#include "net/base/escape.h" +#include "net/url_request/url_request.h" +#include "webkit/appcache/appcache_policy.h" #include "webkit/appcache/appcache_service.h" namespace { -const char kErrorMessage[] = "Error in retrieving Application caches."; -const char kEmptyAppCachesMessage[] = "No available Application caches."; +const char kErrorMessage[] = "Error in retrieving Application Caches."; +const char kEmptyAppCachesMessage[] = "No available Application Caches."; +const char kRemoveAppCache[] = "Remove this AppCache"; +const char kManifest[] = "Manifest: "; +const char kSize[] = "Size: "; +const char kCreationTime[] = "Creation Time: "; +const char kLastAccessTime[] = "Last Access Time: "; +const char kLastUpdateTime[] = "Last Update Time: "; +const char kFormattedDisabledAppCacheMsg[] = + "" + "This Application Cache is disabled by policy.
"; void StartHTML(std::string* out) { DCHECK(out); out->append( "" - "AppCache Internals" + "AppCache Internals" ""); + "" + "\n" + "" + ""); } void EndHTML(std::string* out) { @@ -34,6 +61,17 @@ void EndHTML(std::string* out) { out->append(""); } +// Appends an input button to |data| with text |title| that sends the command +// string |command| back to the browser, and then refreshes the page. +void DrawCommandButton(const std::string& title, + const std::string& command, + std::string* data) { + StringAppendF(data, "", + title.c_str(), + command.c_str()); +} + void AddLiTag(const std::string& element_title, const std::string& element_data, std::string* out) { DCHECK(out); @@ -52,6 +90,7 @@ void WrapInHREF(const std::string& in, std::string* out) { } void AddHTMLFromAppCacheToOutput( + const appcache::AppCacheService& appcache_service, const appcache::AppCacheInfoVector& appcaches, std::string* out) { for (std::vector::const_iterator info = appcaches.begin(); @@ -59,23 +98,29 @@ void AddHTMLFromAppCacheToOutput( out->append("

"); std::string anchored_manifest; WrapInHREF(info->manifest_url.spec(), &anchored_manifest); - out->append("Manifest: "); + out->append(kManifest); out->append(anchored_manifest); + if (!appcache_service.appcache_policy()->CanLoadAppCache( + info->manifest_url)) { + out->append(kFormattedDisabledAppCacheMsg); + } + out->append("
"); + DrawCommandButton(kRemoveAppCache, info->manifest_url.spec(), out); out->append("

( + this, &ViewAppCacheInternalsJob::AppCacheDone); + appcache_service_->GetAllAppCacheInfo( + info_collection_, appcache_done_callback_); +} + +void ViewAppCacheInternalsJob::RemoveAppCacheInfoAsync( + const std::string& manifest_url_spec) { + appcache_done_callback_ = + new net::CancelableCompletionCallback( + this, &ViewAppCacheInternalsJob::AppCacheDone); + + GURL manifest(manifest_url_spec); + appcache_service_->DeleteAppCacheGroup( + manifest, appcache_done_callback_); } void ViewAppCacheInternalsJob::Start() { if (!request_) return; - info_collection_ = new AppCacheInfoCollection; - appcache_info_callback_ = - new net::CancelableCompletionCallback( - this, &ViewAppCacheInternalsJob::OnGotAppCacheInfo); + // Handle any remove appcache request, then redirect back to + // the same URL stripped of query parameters. The redirect happens as part + // of IsRedirectResponse(). + if (request_->url().has_query()) { + std::string remove_appcache_manifest( + GetAppCacheManifestToRemove(request_->url().query())); - appcache_service_->GetAllAppCacheInfo( - info_collection_, appcache_info_callback_); + // Empty manifests are dealt with by the deleter. + RemoveAppCacheInfoAsync(remove_appcache_manifest); + } else { + GetAppCacheInfoAsync(); + } +} + +bool ViewAppCacheInternalsJob::IsRedirectResponse( + GURL* location, int* http_status_code) { + if (request_->url().has_query()) { + // Strip the query parameters. + GURL::Replacements replacements; + replacements.ClearQuery(); + *location = request_->url().ReplaceComponents(replacements); + *http_status_code = 307; + return true; + } + return false; } void ViewAppCacheInternalsJob::GenerateHTMLAppCacheInfo( @@ -136,11 +227,11 @@ void ViewAppCacheInternalsJob::GenerateHTMLAppCacheInfo( std::sort(appcaches.begin(), appcaches.end(), manifest_url_comparator); - AddHTMLFromAppCacheToOutput(appcaches, out); + AddHTMLFromAppCacheToOutput(*appcache_service_, appcaches, out); } -void ViewAppCacheInternalsJob::OnGotAppCacheInfo(int rv) { - appcache_info_callback_ = NULL; +void ViewAppCacheInternalsJob::AppCacheDone(int rv) { + appcache_done_callback_ = NULL; if (rv != net::OK) info_collection_ = NULL; StartAsync(); diff --git a/webkit/appcache/view_appcache_internals_job.h b/webkit/appcache/view_appcache_internals_job.h index dd5c9cf..fee0801 100644 --- a/webkit/appcache/view_appcache_internals_job.h +++ b/webkit/appcache/view_appcache_internals_job.h @@ -24,24 +24,27 @@ class ViewAppCacheInternalsJob : public URLRequestSimpleJob { // Fetches the AppCache Info and calls StartAsync after it is done. virtual void Start(); - // URLRequestSimpleJob methods: virtual bool GetData(std::string* mime_type, std::string* charset, std::string* data) const; - // Callback after asynchronously fetching contents for appcache service. - void OnGotAppCacheInfo(int rv); + // Overridden method from URLRequestJob. + virtual bool IsRedirectResponse(GURL* location, int* http_status_code); private: ~ViewAppCacheInternalsJob(); + void AppCacheDone(int rv); + // Adds HTML from appcache information to out. void GenerateHTMLAppCacheInfo(std::string* out) const; + void GetAppCacheInfoAsync(); + void RemoveAppCacheInfoAsync(const std::string& manifest_url_spec); - // Callback for post-processing. + // This is a common callback for both remove and getinfo for appcache. scoped_refptr > - appcache_info_callback_; - // Store appcache information. + appcache_done_callback_; + scoped_refptr info_collection_; // Not owned. AppCacheService* appcache_service_; -- cgit v1.1