Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / web_contents_delegate_android / android / java / src / org / chromium / components / web_contents_delegate_android / ColorChooserAndroid.java

diff --git a/src/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java b/src/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java
index c276916..e0041a3 100644 (file)
--- a/src/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java
+++ b/src/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java
@@ -4,14 +4,15 @@
 
 package org.chromium.components.web_contents_delegate_android;
 
+import android.app.Activity;
 import android.content.Context;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
-import org.chromium.content.browser.ContentViewCore;
 import org.chromium.ui.ColorPickerDialog;
 import org.chromium.ui.ColorSuggestion;
 import org.chromium.ui.OnColorChangedListener;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * ColorChooserAndroid communicates with the java ColorPickerDialog and the
@@ -25,11 +26,11 @@ public class ColorChooserAndroid {
     private ColorChooserAndroid(long nativeColorChooserAndroid,
             Context context, int initialColor, ColorSuggestion[] suggestions) {
         OnColorChangedListener listener = new OnColorChangedListener() {
-          @Override
-          public void onColorChanged(int color) {
-              mDialog.dismiss();
-              nativeOnColorChosen(mNativeColorChooserAndroid, color);
-          }
+            @Override
+            public void onColorChanged(int color) {
+                mDialog.dismiss();
+                nativeOnColorChosen(mNativeColorChooserAndroid, color);
+            }
         };
 
         mNativeColorChooserAndroid = nativeColorChooserAndroid;
@@ -48,11 +49,13 @@ public class ColorChooserAndroid {
     @CalledByNative
     public static ColorChooserAndroid createColorChooserAndroid(
             long nativeColorChooserAndroid,
-            ContentViewCore contentViewCore,
+            WindowAndroid windowAndroid,
             int initialColor,
             ColorSuggestion[] suggestions) {
+        Activity windowAndroidActivity = windowAndroid.getActivity().get();
+        if (windowAndroidActivity == null) return null;
         ColorChooserAndroid chooser = new ColorChooserAndroid(nativeColorChooserAndroid,
-            contentViewCore.getContext(), initialColor, suggestions);
+                windowAndroidActivity, initialColor, suggestions);
         chooser.openColorChooser();
         return chooser;
     }