| Index: content/child/appcache/appcache_frontend_impl.cc
|
| diff --git a/content/child/appcache/appcache_frontend_impl.cc b/content/child/appcache/appcache_frontend_impl.cc
|
| index 1a33e0de2e3963e9f9d8886e1a03e39e0a1016a7..8ede37a21baa2a362b30f1683dc4e2a75266abdd 100644
|
| --- a/content/child/appcache/appcache_frontend_impl.cc
|
| +++ b/content/child/appcache/appcache_frontend_impl.cc
|
| @@ -19,14 +19,14 @@ inline WebApplicationCacheHostImpl* GetHost(int id) {
|
| }
|
|
|
| void AppCacheFrontendImpl::OnCacheSelected(int host_id,
|
| - const appcache::AppCacheInfo& info) {
|
| + const AppCacheInfo& info) {
|
| WebApplicationCacheHostImpl* host = GetHost(host_id);
|
| if (host)
|
| host->OnCacheSelected(info);
|
| }
|
|
|
| void AppCacheFrontendImpl::OnStatusChanged(const std::vector<int>& host_ids,
|
| - appcache::AppCacheStatus status) {
|
| + AppCacheStatus status) {
|
| for (std::vector<int>::const_iterator i = host_ids.begin();
|
| i != host_ids.end(); ++i) {
|
| WebApplicationCacheHostImpl* host = GetHost(*i);
|
| @@ -36,10 +36,10 @@ void AppCacheFrontendImpl::OnStatusChanged(const std::vector<int>& host_ids,
|
| }
|
|
|
| void AppCacheFrontendImpl::OnEventRaised(const std::vector<int>& host_ids,
|
| - appcache::AppCacheEventID event_id) {
|
| + AppCacheEventID event_id) {
|
| DCHECK(event_id !=
|
| - appcache::APPCACHE_PROGRESS_EVENT); // See OnProgressEventRaised.
|
| - DCHECK(event_id != appcache::APPCACHE_ERROR_EVENT); // See OnErrorEventRaised.
|
| + APPCACHE_PROGRESS_EVENT); // See OnProgressEventRaised.
|
| + DCHECK(event_id != APPCACHE_ERROR_EVENT); // See OnErrorEventRaised.
|
| for (std::vector<int>::const_iterator i = host_ids.begin();
|
| i != host_ids.end(); ++i) {
|
| WebApplicationCacheHostImpl* host = GetHost(*i);
|
| @@ -63,7 +63,7 @@ void AppCacheFrontendImpl::OnProgressEventRaised(
|
|
|
| void AppCacheFrontendImpl::OnErrorEventRaised(
|
| const std::vector<int>& host_ids,
|
| - const appcache::AppCacheErrorDetails& details) {
|
| + const AppCacheErrorDetails& details) {
|
| for (std::vector<int>::const_iterator i = host_ids.begin();
|
| i != host_ids.end(); ++i) {
|
| WebApplicationCacheHostImpl* host = GetHost(*i);
|
| @@ -73,7 +73,7 @@ void AppCacheFrontendImpl::OnErrorEventRaised(
|
| }
|
|
|
| void AppCacheFrontendImpl::OnLogMessage(int host_id,
|
| - appcache::AppCacheLogLevel log_level,
|
| + AppCacheLogLevel log_level,
|
| const std::string& message) {
|
| WebApplicationCacheHostImpl* host = GetHost(host_id);
|
| if (host)
|
| @@ -90,67 +90,67 @@ void AppCacheFrontendImpl::OnContentBlocked(int host_id,
|
| // Ensure that enum values never get out of sync with the
|
| // ones declared for use within the WebKit api
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::Uncached ==
|
| - (int)appcache::APPCACHE_STATUS_UNCACHED, Uncached);
|
| + (int)APPCACHE_STATUS_UNCACHED, Uncached);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::Idle ==
|
| - (int)appcache::APPCACHE_STATUS_IDLE, Idle);
|
| + (int)APPCACHE_STATUS_IDLE, Idle);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::Checking ==
|
| - (int)appcache::APPCACHE_STATUS_CHECKING, Checking);
|
| + (int)APPCACHE_STATUS_CHECKING, Checking);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::Downloading ==
|
| - (int)appcache::APPCACHE_STATUS_DOWNLOADING, Downloading);
|
| + (int)APPCACHE_STATUS_DOWNLOADING, Downloading);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::UpdateReady ==
|
| - (int)appcache::APPCACHE_STATUS_UPDATE_READY, UpdateReady);
|
| + (int)APPCACHE_STATUS_UPDATE_READY, UpdateReady);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::Obsolete ==
|
| - (int)appcache::APPCACHE_STATUS_OBSOLETE, Obsolete);
|
| + (int)APPCACHE_STATUS_OBSOLETE, Obsolete);
|
|
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::CheckingEvent ==
|
| - (int)appcache::APPCACHE_CHECKING_EVENT, CheckingEvent);
|
| + (int)APPCACHE_CHECKING_EVENT, CheckingEvent);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::ErrorEvent ==
|
| - (int)appcache::APPCACHE_ERROR_EVENT, ErrorEvent);
|
| + (int)APPCACHE_ERROR_EVENT, ErrorEvent);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::NoUpdateEvent ==
|
| - (int)appcache::APPCACHE_NO_UPDATE_EVENT, NoUpdateEvent);
|
| + (int)APPCACHE_NO_UPDATE_EVENT, NoUpdateEvent);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::DownloadingEvent ==
|
| - (int)appcache::APPCACHE_DOWNLOADING_EVENT, DownloadingEvent);
|
| + (int)APPCACHE_DOWNLOADING_EVENT, DownloadingEvent);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::ProgressEvent ==
|
| - (int)appcache::APPCACHE_PROGRESS_EVENT, ProgressEvent);
|
| + (int)APPCACHE_PROGRESS_EVENT, ProgressEvent);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::UpdateReadyEvent ==
|
| - (int)appcache::APPCACHE_UPDATE_READY_EVENT, UpdateReadyEvent);
|
| + (int)APPCACHE_UPDATE_READY_EVENT, UpdateReadyEvent);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::CachedEvent ==
|
| - (int)appcache::APPCACHE_CACHED_EVENT, CachedEvent);
|
| + (int)APPCACHE_CACHED_EVENT, CachedEvent);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::ObsoleteEvent ==
|
| - (int)appcache::APPCACHE_OBSOLETE_EVENT, ObsoleteEvent);
|
| + (int)APPCACHE_OBSOLETE_EVENT, ObsoleteEvent);
|
|
|
| COMPILE_ASSERT((int)WebConsoleMessage::LevelDebug ==
|
| - (int)appcache::APPCACHE_LOG_DEBUG, LevelDebug);
|
| + (int)APPCACHE_LOG_DEBUG, LevelDebug);
|
| COMPILE_ASSERT((int)WebConsoleMessage::LevelLog ==
|
| - (int)appcache::APPCACHE_LOG_INFO, LevelLog);
|
| + (int)APPCACHE_LOG_INFO, LevelLog);
|
| COMPILE_ASSERT((int)WebConsoleMessage::LevelWarning ==
|
| - (int)appcache::APPCACHE_LOG_WARNING, LevelWarning);
|
| + (int)APPCACHE_LOG_WARNING, LevelWarning);
|
| COMPILE_ASSERT((int)WebConsoleMessage::LevelError ==
|
| - (int)appcache::APPCACHE_LOG_ERROR, LevelError);
|
| + (int)APPCACHE_LOG_ERROR, LevelError);
|
|
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::ManifestError ==
|
| - (int)appcache::APPCACHE_MANIFEST_ERROR,
|
| + (int)APPCACHE_MANIFEST_ERROR,
|
| ManifestError);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::SignatureError ==
|
| - (int)appcache::APPCACHE_SIGNATURE_ERROR,
|
| + (int)APPCACHE_SIGNATURE_ERROR,
|
| SignatureError);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::ResourceError ==
|
| - (int)appcache::APPCACHE_RESOURCE_ERROR,
|
| + (int)APPCACHE_RESOURCE_ERROR,
|
| ResourceError);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::ChangedError ==
|
| - (int)appcache::APPCACHE_CHANGED_ERROR,
|
| + (int)APPCACHE_CHANGED_ERROR,
|
| ChangedError);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::AbortError ==
|
| - (int)appcache::APPCACHE_ABORT_ERROR,
|
| + (int)APPCACHE_ABORT_ERROR,
|
| AbortError);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::QuotaError ==
|
| - (int)appcache::APPCACHE_QUOTA_ERROR,
|
| + (int)APPCACHE_QUOTA_ERROR,
|
| QuotaError);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::PolicyError ==
|
| - (int)appcache::APPCACHE_POLICY_ERROR,
|
| + (int)APPCACHE_POLICY_ERROR,
|
| PolicyError);
|
| COMPILE_ASSERT((int)WebApplicationCacheHost::UnknownError ==
|
| - (int)appcache::APPCACHE_UNKNOWN_ERROR,
|
| + (int)APPCACHE_UNKNOWN_ERROR,
|
| UnknownError);
|
|
|
| } // namespace content
|
|
|