Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / web_contents_delegate_android / color_chooser_android.cc

diff --git a/src/components/web_contents_delegate_android/color_chooser_android.cc b/src/components/web_contents_delegate_android/color_chooser_android.cc
index a1dcf40..8c49f47 100644 (file)
--- a/src/components/web_contents_delegate_android/color_chooser_android.cc
+++ b/src/components/web_contents_delegate_android/color_chooser_android.cc
@@ -6,11 +6,10 @@
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
-#include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_view.h"
 #include "content/public/common/color_suggestion.h"
 #include "jni/ColorChooserAndroid_jni.h"
+#include "ui/base/android/window_android.h"
 
 using base::android::ConvertUTF16ToJavaString;
 
@@ -22,10 +21,6 @@ ColorChooserAndroid::ColorChooserAndroid(
     const std::vector<content::ColorSuggestion>& suggestions)
     : web_contents_(web_contents) {
   JNIEnv* env = AttachCurrentThread();
-  content::ContentViewCore* content_view_core =
-      content::ContentViewCore::FromWebContents(web_contents);
-  DCHECK(content_view_core);
-
   ScopedJavaLocalRef<jobjectArray> suggestions_array;
 
   if (suggestions.size() > 0) {
@@ -47,9 +42,11 @@ ColorChooserAndroid::ColorChooserAndroid(
   j_color_chooser_.Reset(Java_ColorChooserAndroid_createColorChooserAndroid(
       env,
       reinterpret_cast<intptr_t>(this),
-      content_view_core->GetJavaObject().obj(),
+      web_contents->GetTopLevelNativeWindow()->GetJavaObject().obj(),
       initial_color,
       suggestions_array.obj()));
+  if (j_color_chooser_.is_null())
+    OnColorChosen(env, j_color_chooser_.obj(), initial_color);
 }
 
 ColorChooserAndroid::~ColorChooserAndroid() {