diff options
author | pilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-15 23:32:46 +0000 |
---|---|---|
committer | pilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-15 23:32:46 +0000 |
commit | 10f110fa152ec1f7d1c7797f2bb21b9387eb3188 (patch) | |
tree | 096186743f44b6f9dc74501404a61a56779761e4 /webkit/common | |
parent | 7641fe33dae7bb8ef977232c6803b3faf8b2cbd4 (diff) | |
download | chromium_src-10f110fa152ec1f7d1c7797f2bb21b9387eb3188.zip chromium_src-10f110fa152ec1f7d1c7797f2bb21b9387eb3188.tar.gz chromium_src-10f110fa152ec1f7d1c7797f2bb21b9387eb3188.tar.bz2 |
Rename appcache constants in preparation for move to content namespace
BUG=338338
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/337713004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277339 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/common')
-rw-r--r-- | webkit/common/appcache/appcache_interfaces.cc | 10 | ||||
-rw-r--r-- | webkit/common/appcache/appcache_interfaces.h | 74 |
2 files changed, 42 insertions, 42 deletions
diff --git a/webkit/common/appcache/appcache_interfaces.cc b/webkit/common/appcache/appcache_interfaces.cc index 2889976..e89f550 100644 --- a/webkit/common/appcache/appcache_interfaces.cc +++ b/webkit/common/appcache/appcache_interfaces.cc @@ -24,9 +24,9 @@ const base::FilePath::CharType kAppCacheDatabaseName[] = FILE_PATH_LITERAL("Index"); AppCacheInfo::AppCacheInfo() - : cache_id(kNoCacheId), + : cache_id(kAppCacheNoCacheId), group_id(0), - status(UNCACHED), + status(APPCACHE_STATUS_UNCACHED), size(0), is_complete(false) { } @@ -43,7 +43,7 @@ AppCacheResourceInfo::AppCacheResourceInfo() is_fallback(false), is_foreign(false), is_explicit(false), - response_id(kNoResponseId) { + response_id(kAppCacheNoResponseId) { } AppCacheResourceInfo::~AppCacheResourceInfo() { @@ -51,7 +51,7 @@ AppCacheResourceInfo::~AppCacheResourceInfo() { AppCacheErrorDetails::AppCacheErrorDetails() : message(), - reason(UNKNOWN_ERROR), + reason(APPCACHE_UNKNOWN_ERROR), url(), status(0), is_cross_origin(false) {} @@ -71,7 +71,7 @@ AppCacheErrorDetails::AppCacheErrorDetails( AppCacheErrorDetails::~AppCacheErrorDetails() {} Namespace::Namespace() - : type(FALLBACK_NAMESPACE), + : type(APPCACHE_FALLBACK_NAMESPACE), is_pattern(false), is_executable(false) { } diff --git a/webkit/common/appcache/appcache_interfaces.h b/webkit/common/appcache/appcache_interfaces.h index 13d34ba..558d6e2 100644 --- a/webkit/common/appcache/appcache_interfaces.h +++ b/webkit/common/appcache/appcache_interfaces.h @@ -23,57 +23,57 @@ namespace appcache { // Defines constants, types, and abstract classes used in the main // process and in child processes. -static const int kNoHostId = 0; -static const int64 kNoCacheId = 0; -static const int64 kNoResponseId = 0; -static const int64 kUnknownCacheId = -1; +static const int kAppCacheNoHostId = 0; +static const int64 kAppCacheNoCacheId = 0; +static const int64 kAppCacheNoResponseId = 0; +static const int64 kAppCacheUnknownCacheId = -1; enum AppCacheStatus { - UNCACHED, - IDLE, - CHECKING, - DOWNLOADING, - UPDATE_READY, - OBSOLETE, - STATUS_LAST = OBSOLETE + APPCACHE_STATUS_UNCACHED, + APPCACHE_STATUS_IDLE, + APPCACHE_STATUS_CHECKING, + APPCACHE_STATUS_DOWNLOADING, + APPCACHE_STATUS_UPDATE_READY, + APPCACHE_STATUS_OBSOLETE, + APPCACHE_STATUS_LAST = APPCACHE_STATUS_OBSOLETE }; enum AppCacheEventID { - CHECKING_EVENT, - ERROR_EVENT, - NO_UPDATE_EVENT, - DOWNLOADING_EVENT, - PROGRESS_EVENT, - UPDATE_READY_EVENT, - CACHED_EVENT, - OBSOLETE_EVENT, - EVENT_ID_LAST = OBSOLETE_EVENT + APPCACHE_CHECKING_EVENT, + APPCACHE_ERROR_EVENT, + APPCACHE_NO_UPDATE_EVENT, + APPCACHE_DOWNLOADING_EVENT, + APPCACHE_PROGRESS_EVENT, + APPCACHE_UPDATE_READY_EVENT, + APPCACHE_CACHED_EVENT, + APPCACHE_OBSOLETE_EVENT, + APPCACHE_EVENT_ID_LAST = APPCACHE_OBSOLETE_EVENT }; // Temporarily renumber them in wierd way, to help remove LOG_TIP from WebKit enum AppCacheLogLevel { - LOG_DEBUG = 4, - LOG_INFO = 1, - LOG_WARNING = 2, - LOG_ERROR = 3, + APPCACHE_LOG_DEBUG = 4, + APPCACHE_LOG_INFO = 1, + APPCACHE_LOG_WARNING = 2, + APPCACHE_LOG_ERROR = 3, }; enum AppCacheNamespaceType { - FALLBACK_NAMESPACE, - INTERCEPT_NAMESPACE, - NETWORK_NAMESPACE + APPCACHE_FALLBACK_NAMESPACE, + APPCACHE_INTERCEPT_NAMESPACE, + APPCACHE_NETWORK_NAMESPACE }; enum AppCacheErrorReason { - MANIFEST_ERROR, - SIGNATURE_ERROR, - RESOURCE_ERROR, - CHANGED_ERROR, - ABORT_ERROR, - QUOTA_ERROR, - POLICY_ERROR, - UNKNOWN_ERROR, - ERROR_REASON_LAST = UNKNOWN_ERROR + APPCACHE_MANIFEST_ERROR, + APPCACHE_SIGNATURE_ERROR, + APPCACHE_RESOURCE_ERROR, + APPCACHE_CHANGED_ERROR, + APPCACHE_ABORT_ERROR, + APPCACHE_QUOTA_ERROR, + APPCACHE_POLICY_ERROR, + APPCACHE_UNKNOWN_ERROR, + APPCACHE_ERROR_REASON_LAST = APPCACHE_UNKNOWN_ERROR }; struct WEBKIT_STORAGE_COMMON_EXPORT AppCacheInfo { @@ -128,7 +128,7 @@ struct WEBKIT_STORAGE_COMMON_EXPORT AppCacheErrorDetails { typedef std::vector<AppCacheResourceInfo> AppCacheResourceInfoVector; struct WEBKIT_STORAGE_COMMON_EXPORT Namespace { - Namespace(); // Type is set to FALLBACK_NAMESPACE by default. + Namespace(); // Type is set to APPCACHE_FALLBACK_NAMESPACE by default. Namespace(AppCacheNamespaceType type, const GURL& url, const GURL& target, bool is_pattern); Namespace(AppCacheNamespaceType type, const GURL& url, const GURL& target, |