Optimizing DateTimeAndroid and ColorChooserAndroid initializations.

content/public/android/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser.input;
 
+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.base.WindowAndroid;
 import org.chromium.ui.picker.DateTimeSuggestion;
 import org.chromium.ui.picker.InputDialogContainer;
 
 /**
  * Plumbing for the different date/time dialog adapters.
  */
 @JNINamespace("content")
 class DateTimeChooserAndroid {
 
     private final long mNativeDateTimeChooserAndroid;
@@ skipping 18 matching lines @@
     }
 
     private void showDialog(int dialogType, double dialogValue,
                             double min, double max, double step,
                             DateTimeSuggestion[] suggestions) {
         mInputDialogContainer.showDialog(dialogType, dialogValue, min, max, step, suggestions);
     }
 
     @CalledByNative
     private static DateTimeChooserAndroid createDateTimeChooser(
-            ContentViewCore contentViewCore,
+            WindowAndroid windowAndroid,
             long nativeDateTimeChooserAndroid,
             int dialogType, double dialogValue,
             double min, double max, double step,
             DateTimeSuggestion[] suggestions) {
+        Activity windowAndroidActivity = windowAndroid.getActivity().get();
+        if (windowAndroidActivity == null) return null;
         DateTimeChooserAndroid chooser =
-                new DateTimeChooserAndroid(
-                        contentViewCore.getContext(),
-                        nativeDateTimeChooserAndroid);
+                new DateTimeChooserAndroid(windowAndroidActivity, nativeDateTimeChooserAndroid);
         chooser.showDialog(dialogType, dialogValue, min, max, step, suggestions);
         return chooser;
     }
 
     @CalledByNative
     private static DateTimeSuggestion[] createSuggestionsArray(int size) {
         return new DateTimeSuggestion[size];
     }
 
     /**
@@ skipping 18 matching lines @@
                 textInputTypeDate,
                 textInputTypeDateTime, textInputTypeDateTimeLocal,
                 textInputTypeMonth, textInputTypeTime, textInputTypeWeek);
     }
 
     private native void nativeReplaceDateTime(long nativeDateTimeChooserAndroid,
                                               double dialogValue);
 
     private native void nativeCancelDialog(long nativeDateTimeChooserAndroid);
 }