Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / android / core_internal / src / org / xwalk / core / internal / XWalkContentsClientBridge.java

diff --git a/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/XWalkContentsClientBridge.java b/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/XWalkContentsClientBridge.java
index f8b2618..1e9fc2d 100644 (file)
--- a/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/XWalkContentsClientBridge.java
+++ b/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/XWalkContentsClientBridge.java
@@ -378,7 +378,7 @@ class XWalkContentsClientBridge extends XWalkContentsClient
     @Override
     public boolean onCreateWindow(boolean isDialog, boolean isUserGesture) {
         if (isDialog) return false;
-        
+
         XWalkUIClientInternal.InitiateByInternal initiator =
                 XWalkUIClientInternal.InitiateByInternal.BY_JAVASCRIPT;
         if (isUserGesture) {
@@ -649,15 +649,10 @@ class XWalkContentsClientBridge extends XWalkContentsClient
     }
 
     @CalledByNative
-    private void updateNotificationIcon(int notificationId, Bitmap icon) {
-        mNotificationService.updateNotificationIcon(notificationId, icon);
-    }
-
-    @CalledByNative
     private void showNotification(String title, String message, String replaceId,
-            int notificationId) {
+            Bitmap icon, int notificationId) {
         mNotificationService.showNotification(
-                title, message, replaceId, notificationId);
+                title, message, replaceId, icon, notificationId);
     }
 
     @CalledByNative
@@ -685,11 +680,6 @@ class XWalkContentsClientBridge extends XWalkContentsClient
         nativeNotificationDisplayed(mNativeContentsClientBridge, id);
     }
 
-    public void notificationError(int id) {
-        if (mNativeContentsClientBridge == 0) return;
-        nativeNotificationError(mNativeContentsClientBridge, id);
-    }
-
     public void notificationClicked(int id) {
         if (mNativeContentsClientBridge == 0) return;
         nativeNotificationClicked(mNativeContentsClientBridge, id);
@@ -749,7 +739,6 @@ class XWalkContentsClientBridge extends XWalkContentsClient
     private native void nativeCancelJsResult(long nativeXWalkContentsClientBridge, int id);
     private native void nativeExitFullscreen(long nativeXWalkContentsClientBridge, long nativeWebContents);
     private native void nativeNotificationDisplayed(long nativeXWalkContentsClientBridge, int id);
-    private native void nativeNotificationError(long nativeXWalkContentsClientBridge, int id);
     private native void nativeNotificationClicked(long nativeXWalkContentsClientBridge, int id);
     private native void nativeNotificationClosed(long nativeXWalkContentsClientBridge, int id, boolean byUser);
     private native void nativeOnFilesSelected(long nativeXWalkContentsClientBridge,