Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(297)

Unified Diff: content/common/appcache_interfaces.cc

Issue 344493002: Move all remaining appcache-related code to content namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/appcache_interfaces.cc
diff --git a/webkit/common/appcache/appcache_interfaces.cc b/content/common/appcache_interfaces.cc
similarity index 84%
rename from webkit/common/appcache/appcache_interfaces.cc
rename to content/common/appcache_interfaces.cc
index e89f5507e6e6428655713b8b1ad3967547420a99..f9f9a05b3a78de163b4696a116d349c2ce32a97f 100644
--- a/webkit/common/appcache/appcache_interfaces.cc
+++ b/content/common/appcache_interfaces.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "webkit/common/appcache/appcache_interfaces.h"
+#include "content/common/appcache_interfaces.h"
#include <set>
@@ -10,7 +10,7 @@
#include "net/url_request/url_request.h"
#include "url/gurl.h"
-namespace appcache {
+namespace content {
const char kHttpScheme[] = "http";
const char kHttpsScheme[] = "https";
@@ -70,13 +70,13 @@ AppCacheErrorDetails::AppCacheErrorDetails(
AppCacheErrorDetails::~AppCacheErrorDetails() {}
-Namespace::Namespace()
+AppCacheNamespace::AppCacheNamespace()
: type(APPCACHE_FALLBACK_NAMESPACE),
is_pattern(false),
is_executable(false) {
}
-Namespace::Namespace(
+AppCacheNamespace::AppCacheNamespace(
AppCacheNamespaceType type, const GURL& url, const GURL& target,
bool is_pattern)
: type(type),
@@ -86,7 +86,7 @@ Namespace::Namespace(
is_executable(false) {
}
-Namespace::Namespace(
+AppCacheNamespace::AppCacheNamespace(
AppCacheNamespaceType type, const GURL& url, const GURL& target,
bool is_pattern, bool is_executable)
: type(type),
@@ -96,10 +96,10 @@ Namespace::Namespace(
is_executable(is_executable) {
}
-Namespace::~Namespace() {
+AppCacheNamespace::~AppCacheNamespace() {
}
-bool Namespace::IsMatch(const GURL& url) const {
+bool AppCacheNamespace::IsMatch(const GURL& url) const {
if (is_pattern) {
// We have to escape '?' characters since MatchPattern also treats those
// as wildcards which we don't want here, we only do '*'s.
@@ -111,7 +111,7 @@ bool Namespace::IsMatch(const GURL& url) const {
return StartsWithASCII(url.spec(), namespace_url.spec(), true);
}
-bool IsSchemeSupported(const GURL& url) {
+bool IsSchemeSupportedForAppCache(const GURL& url) {
bool supported = url.SchemeIs(kHttpScheme) || url.SchemeIs(kHttpsScheme) ||
url.SchemeIs(kDevToolsScheme);
@@ -127,13 +127,13 @@ bool IsSchemeSupported(const GURL& url) {
return supported;
}
-bool IsMethodSupported(const std::string& method) {
+bool IsMethodSupportedForAppCache(const std::string& method) {
return (method == kHttpGETMethod) || (method == kHttpHEADMethod);
}
-bool IsSchemeAndMethodSupported(const net::URLRequest* request) {
- return IsSchemeSupported(request->url()) &&
- IsMethodSupported(request->method());
+bool IsSchemeAndMethodSupportedForAppCache(const net::URLRequest* request) {
+ return IsSchemeSupportedForAppCache(request->url()) &&
+ IsMethodSupportedForAppCache(request->method());
}
-} // namespace appcache
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698