Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / browser / android / xwalk_contents_client_bridge.cc

diff --git a/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge.cc b/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge.cc
index d5b30af..5cb998d 100644 (file)
--- a/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge.cc
+++ b/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge.cc
@@ -18,6 +18,7 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/file_chooser_file_info.h"
 #include "content/public/common/file_chooser_params.h"
 #include "content/public/common/show_desktop_notification_params.h"
 #include "jni/XWalkContentsClientBridge_jni.h"
@@ -43,16 +44,6 @@ namespace xwalk {
 
 namespace {
 
-void RunUpdateNotificationIconOnUIThread(
-    int notification_id,
-    content::RenderFrameHost* render_frame_host,
-    const SkBitmap& icon) {
-  XWalkContentsClientBridgeBase* bridge =
-      XWalkContentsClientBridgeBase::FromRenderFrameHost(render_frame_host);
-  if (bridge)
-    bridge->UpdateNotificationIcon(notification_id, icon);
-}
-
 int g_next_notification_id_ = 1;
 
 ScopedPtrHashMap<int, content::DesktopNotificationDelegate> g_notification_map_;
@@ -98,7 +89,9 @@ void XWalkContentsClientBridge::AllowCertificateError(
     return;
 
   std::string der_string;
-  net::X509Certificate::GetDEREncoded(cert->os_cert_handle(), &der_string);
+  if (!net::X509Certificate::GetDEREncoded(cert->os_cert_handle(),
+      &der_string))
+    return;
   ScopedJavaLocalRef<jbyteArray> jcert = base::android::ToJavaByteArray(
       env,
       reinterpret_cast<const uint8*>(der_string.data()),
@@ -212,52 +205,6 @@ bool XWalkContentsClientBridge::OnReceivedHttpAuthRequest(
   return true;
 }
 
-void XWalkContentsClientBridge::OnNotificationIconDownloaded(
-    int id,
-    int http_status_code,
-    const GURL& icon_url,
-    const std::vector<SkBitmap>& bitmaps,
-    const std::vector<gfx::Size>& original_bitmap_sizes) {
-  if (bitmaps.empty() && http_status_code == 404) {
-    LOG(WARNING) << "Failed to download notification icon from "
-                 << icon_url.spec();
-  } else {
-    NotificationDownloadRequestIdMap::iterator iter =
-        downloading_icon_notifications_.find(id);
-    if (iter == downloading_icon_notifications_.end())
-      return;
-
-    int notification_id = iter->second.first;
-    content::RenderFrameHost* render_frame_host = iter->second.second;
-    // This will lead to a second call of ShowNotification for the
-    // same notification id to update the icon. On Android, when
-    // the notification which is already shown is fired again, it will
-    // silently update the content only.
-    BrowserThread::PostTask(
-        BrowserThread::UI,
-        FROM_HERE,
-        base::Bind(&RunUpdateNotificationIconOnUIThread,
-                   notification_id,
-                   render_frame_host,
-                   bitmaps[0]));
-  }
-  downloading_icon_notifications_.erase(id);
-}
-
-void XWalkContentsClientBridge::UpdateNotificationIcon(
-    int notification_id, const SkBitmap& icon) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  JNIEnv* env = AttachCurrentThread();
-
-  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
-  if (obj.is_null())
-    return;
-
-  ScopedJavaLocalRef<jobject> jicon = gfx::ConvertToJavaBitmap(&icon);
-  Java_XWalkContentsClientBridge_updateNotificationIcon(
-      env, obj.obj(), notification_id, jicon.obj());
-}
-
 static void CancelNotification(
     JavaObjectWeakGlobalRef java_ref, int notification_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -272,7 +219,6 @@ static void CancelNotification(
 
 void XWalkContentsClientBridge::ShowNotification(
     const content::ShowDesktopNotificationHostMsgParams& params,
-    content::RenderFrameHost* render_frame_host,
     scoped_ptr<content::DesktopNotificationDelegate> delegate,
     base::Closure* cancel_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -288,33 +234,17 @@ void XWalkContentsClientBridge::ShowNotification(
     ConvertUTF16ToJavaString(env, params.body));
   ScopedJavaLocalRef<jstring> jreplace_id(
     ConvertUTF16ToJavaString(env, params.replace_id));
+  ScopedJavaLocalRef<jobject> jicon = gfx::ConvertToJavaBitmap(&params.icon);
 
   int notification_id = g_next_notification_id_++;
   g_notification_map_.set(notification_id, delegate.Pass());
   Java_XWalkContentsClientBridge_showNotification(
       env, obj.obj(), jtitle.obj(), jbody.obj(),
-      jreplace_id.obj(), notification_id);
+      jreplace_id.obj(), jicon.obj(), notification_id);
 
   if (cancel_callback)
     *cancel_callback = base::Bind(
         &CancelNotification, java_ref_, notification_id);
-
-  if (params.icon_url.is_valid()) {
-    WebContents* web_contents =
-      WebContents::FromRenderFrameHost(render_frame_host);
-    if (web_contents) {
-      int download_request_id = web_contents->DownloadImage(
-          params.icon_url,
-          false,
-          0,
-          base::Bind(
-              &XWalkContentsClientBridge::OnNotificationIconDownloaded,
-              base::Unretained(this)));
-      NotificationDownloadRequestInfos info =
-          std::make_pair(notification_id, render_frame_host);
-      downloading_icon_notifications_[download_request_id] = info;
-    }
-  }
 }
 
 void XWalkContentsClientBridge::OnWebLayoutPageScaleFactorChanged(
@@ -373,15 +303,6 @@ void XWalkContentsClientBridge::NotificationDisplayed(
     notification_delegate->NotificationDisplayed();
 }
 
-void XWalkContentsClientBridge::NotificationError(
-    JNIEnv* env, jobject, jint notification_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  content::DesktopNotificationDelegate* notification_delegate =
-      g_notification_map_.get(notification_id);
-  if (notification_delegate)
-    notification_delegate->NotificationError();
-}
-
 void XWalkContentsClientBridge::NotificationClicked(
     JNIEnv*, jobject, jint id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -412,12 +333,11 @@ void XWalkContentsClientBridge::OnFilesSelected(
   std::string file_name =
       base::android::ConvertJavaStringToUTF8(env, display_name);
   base::FilePath file_path = base::FilePath(path);
-  ui::SelectedFileInfo file_info;
+  content::FileChooserFileInfo file_info;
   file_info.file_path = file_path;
-  file_info.local_path = file_path;
   if (!file_name.empty())
     file_info.display_name = file_name;
-  std::vector<ui::SelectedFileInfo> files;
+  std::vector<content::FileChooserFileInfo> files;
   files.push_back(file_info);
 
   rvh->FilesSelectedInChooser(
@@ -431,7 +351,7 @@ void XWalkContentsClientBridge::OnFilesNotSelected(
   if (!rvh)
     return;
 
-  std::vector<ui::SelectedFileInfo> files;
+  std::vector<content::FileChooserFileInfo> files;
 
   rvh->FilesSelectedInChooser(
       files, static_cast<content::FileChooserParams::Mode>(mode));
@@ -470,7 +390,7 @@ void XWalkContentsClientBridge::OnReceivedIcon(const GURL& icon_url,
 }
 
 bool RegisterXWalkContentsClientBridge(JNIEnv* env) {
-  return RegisterNativesImpl(env) >= 0;
+  return RegisterNativesImpl(env);
 }
 
 }  // namespace xwalk