Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / child / appcache / web_application_cache_host_impl.h

diff --git a/src/content/child/appcache/web_application_cache_host_impl.h b/src/content/child/appcache/web_application_cache_host_impl.h
index afda8a0..4f570c5 100644 (file)
--- a/src/content/child/appcache/web_application_cache_host_impl.h
+++ b/src/content/child/appcache/web_application_cache_host_impl.h
@@ -7,16 +7,13 @@
 
 #include <string>
 
+#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 "third_party/WebKit/public/web/WebApplicationCacheHostClient.h"
 #include "url/gurl.h"
 #include "webkit/common/appcache/appcache_interfaces.h"
 
-namespace blink {
-class WebFrame;
-}
-
 namespace content {
 
 class WebApplicationCacheHostImpl
@@ -25,9 +22,6 @@ class WebApplicationCacheHostImpl
   // Returns the host having given id or NULL if there is no such host.
   static WebApplicationCacheHostImpl* FromId(int id);
 
-  // Returns the host associated with the current document in frame.
-  static WebApplicationCacheHostImpl* FromFrame(const blink::WebFrame* frame);
-
   WebApplicationCacheHostImpl(blink::WebApplicationCacheHostClient* client,
                               appcache::AppCacheBackend* backend);
   virtual ~WebApplicationCacheHostImpl();
@@ -40,14 +34,14 @@ class WebApplicationCacheHostImpl
   void OnStatusChanged(appcache::Status);
   void OnEventRaised(appcache::EventID);
   void OnProgressEventRaised(const GURL& url, int num_total, int num_complete);
-  void OnErrorEventRaised(const std::string& message);
+  void OnErrorEventRaised(const appcache::ErrorDetails& details);
   virtual void OnLogMessage(appcache::LogLevel log_level,
                             const std::string& message) {}
   virtual void OnContentBlocked(const GURL& manifest_url) {}
 
   // blink::WebApplicationCacheHost:
-  virtual void willStartMainResourceRequest(blink::WebURLRequest&,
-                                            const blink::WebFrame*);
+  virtual void willStartMainResourceRequest(
+      blink::WebURLRequest&, const blink::WebApplicationCacheHost*);
   virtual void willStartSubResourceRequest(blink::WebURLRequest&);
   virtual void selectCacheWithoutManifest();
   virtual bool selectCacheWithManifest(const blink::WebURL& manifestURL);