Index: content/child/appcache/web_application_cache_host_impl.h |
diff --git a/content/child/appcache/web_application_cache_host_impl.h b/content/child/appcache/web_application_cache_host_impl.h |
index 07ec2dbaa3c4068c348730d328aea72b1ba87079..fe27be2f97a2bcfe8dc9cf5a53cbde76fe3bb47c 100644 |
--- a/content/child/appcache/web_application_cache_host_impl.h |
+++ b/content/child/appcache/web_application_cache_host_impl.h |
@@ -7,12 +7,12 @@ |
#include <string> |
+#include "content/common/appcache_interfaces.h" |
#include "third_party/WebKit/public/platform/WebApplicationCacheHost.h" |
#include "third_party/WebKit/public/platform/WebApplicationCacheHostClient.h" |
#include "third_party/WebKit/public/platform/WebURLResponse.h" |
#include "third_party/WebKit/public/platform/WebVector.h" |
#include "url/gurl.h" |
-#include "webkit/common/appcache/appcache_interfaces.h" |
namespace content { |
@@ -23,19 +23,19 @@ class WebApplicationCacheHostImpl |
static WebApplicationCacheHostImpl* FromId(int id); |
WebApplicationCacheHostImpl(blink::WebApplicationCacheHostClient* client, |
- appcache::AppCacheBackend* backend); |
+ AppCacheBackend* backend); |
virtual ~WebApplicationCacheHostImpl(); |
int host_id() const { return host_id_; } |
- appcache::AppCacheBackend* backend() const { return backend_; } |
+ AppCacheBackend* backend() const { return backend_; } |
blink::WebApplicationCacheHostClient* client() const { return client_; } |
- virtual void OnCacheSelected(const appcache::AppCacheInfo& info); |
- void OnStatusChanged(appcache::AppCacheStatus); |
- void OnEventRaised(appcache::AppCacheEventID); |
+ virtual void OnCacheSelected(const AppCacheInfo& info); |
+ void OnStatusChanged(AppCacheStatus); |
+ void OnEventRaised(AppCacheEventID); |
void OnProgressEventRaised(const GURL& url, int num_total, int num_complete); |
- void OnErrorEventRaised(const appcache::AppCacheErrorDetails& details); |
- virtual void OnLogMessage(appcache::AppCacheLogLevel log_level, |
+ void OnErrorEventRaised(const AppCacheErrorDetails& details); |
+ virtual void OnLogMessage(AppCacheLogLevel log_level, |
const std::string& message) {} |
virtual void OnContentBlocked(const GURL& manifest_url) {} |
@@ -62,15 +62,15 @@ class WebApplicationCacheHostImpl |
}; |
blink::WebApplicationCacheHostClient* client_; |
- appcache::AppCacheBackend* backend_; |
+ AppCacheBackend* backend_; |
int host_id_; |
- appcache::AppCacheStatus status_; |
+ AppCacheStatus status_; |
blink::WebURLResponse document_response_; |
GURL document_url_; |
bool is_scheme_supported_; |
bool is_get_method_; |
IsNewMasterEntry is_new_master_entry_; |
- appcache::AppCacheInfo cache_info_; |
+ AppCacheInfo cache_info_; |
GURL original_main_resource_url_; // Used to detect redirection. |
bool was_select_cache_called_; |
}; |