Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / android_webview / browser / aw_content_browser_client.h

diff --git a/src/android_webview/browser/aw_content_browser_client.h b/src/android_webview/browser/aw_content_browser_client.h
index 28dc4d0..9e4f5f3 100644 (file)
--- a/src/android_webview/browser/aw_content_browser_client.h
+++ b/src/android_webview/browser/aw_content_browser_client.h
@@ -118,13 +118,9 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
           int render_process_id) OVERRIDE;
   virtual void ShowDesktopNotification(
       const content::ShowDesktopNotificationHostMsgParams& params,
-      int render_process_id,
-      int render_view_id,
-      bool worker) OVERRIDE;
-  virtual void CancelDesktopNotification(
-      int render_process_id,
-      int render_view_id,
-      int notification_id) OVERRIDE;
+      content::RenderFrameHost* render_frame_host,
+      content::DesktopNotificationDelegate* delegate,
+      base::Closure* cancel_callback) OVERRIDE;
   virtual bool CanCreateWindow(const GURL& opener_url,
                                const GURL& opener_top_level_frame_url,
                                const GURL& source_origin,
@@ -164,6 +160,11 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
   virtual void OverrideWebkitPrefs(content::RenderViewHost* rvh,
                                    const GURL& url,
                                    WebPreferences* web_prefs) OVERRIDE;
+#if defined(VIDEO_HOLE)
+  virtual content::ExternalVideoSurfaceContainer*
+      OverrideCreateExternalVideoSurfaceContainer(
+          content::WebContents* web_contents) OVERRIDE;
+#endif
 
  private:
   // Android WebView currently has a single global (non-off-the-record) browser