Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / browser / xwalk_content_browser_client.h

diff --git a/src/xwalk/runtime/browser/xwalk_content_browser_client.h b/src/xwalk/runtime/browser/xwalk_content_browser_client.h
index a003537..42bb3c3 100644 (file)
--- a/src/xwalk/runtime/browser/xwalk_content_browser_client.h
+++ b/src/xwalk/runtime/browser/xwalk_content_browser_client.h
@@ -83,9 +83,10 @@ class XWalkContentBrowserClient : public content::ContentBrowserClient {
       int cert_error,
       const net::SSLInfo& ssl_info,
       const GURL& request_url,
-      ResourceType::Type resource_type,
+      content::ResourceType resource_type,
       bool overridable,
       bool strict_enforcement,
+      bool expired_previous_decision,
       const base::Callback<void(bool)>& callback, // NOLINT
       content::CertificateRequestResultType* result) OVERRIDE;
 
@@ -95,8 +96,8 @@ class XWalkContentBrowserClient : public content::ContentBrowserClient {
   virtual void RequestDesktopNotificationPermission(
       const GURL& source_origin,
       content::RenderFrameHost* render_frame_host,
-      const base::Closure& callback) OVERRIDE;
-  virtual blink::WebNotificationPresenter::Permission
+      const base::Callback<void(blink::WebNotificationPermission)>& callback) OVERRIDE; // NOLINT
+  virtual blink::WebNotificationPermission
   CheckDesktopNotificationPermission(
       const GURL& source_url,
       content::ResourceContext* context,
@@ -104,7 +105,7 @@ class XWalkContentBrowserClient : public content::ContentBrowserClient {
   virtual void ShowDesktopNotification(
       const content::ShowDesktopNotificationHostMsgParams& params,
       content::RenderFrameHost* render_frame_host,
-      content::DesktopNotificationDelegate* delegate,
+      scoped_ptr<content::DesktopNotificationDelegate> delegate,
       base::Closure* cancel_callback) OVERRIDE;
   virtual void RequestGeolocationPermission(
       content::WebContents* web_contents,
@@ -147,6 +148,8 @@ class XWalkContentBrowserClient : public content::ContentBrowserClient {
       std::string* partition_name,
       bool* in_memory) OVERRIDE;
 
+  virtual content::DevToolsManagerDelegate*
+      GetDevToolsManagerDelegate() OVERRIDE;
 
   XWalkBrowserMainParts* main_parts() { return main_parts_; }
 
@@ -156,6 +159,7 @@ class XWalkContentBrowserClient : public content::ContentBrowserClient {
   scoped_refptr<RuntimeGeolocationPermissionContext>
     geolocation_permission_context_;
   XWalkBrowserMainParts* main_parts_;
+  RuntimeContext* runtime_context_;
 
   DISALLOW_COPY_AND_ASSIGN(XWalkContentBrowserClient);
 };