Optimizing DateTimeAndroid and ColorChooserAndroid initializations.

content/browser/android/date_time_chooser_android.cc

 // Copyright (c) 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.
 
 #include "content/browser/android/date_time_chooser_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/i18n/char_iterator.h"
 #include "content/common/date_time_suggestion.h"
 #include "content/common/view_messages.h"
-#include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/render_view_host.h"
 #include "jni/DateTimeChooserAndroid_jni.h"
 #include "third_party/icu/source/common/unicode/uchar.h"
 #include "third_party/icu/source/common/unicode/unistr.h"
+#include "ui/base/android/window_android.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 
 
 namespace {
 
 base::string16 SanitizeSuggestionString(const base::string16& string) {
@@ skipping 39 matching lines @@
                                              jobject,
                                              jdouble value) {
   host_->Send(new ViewMsg_ReplaceDateTime(host_->GetRoutingID(), value));
 }
 
 void DateTimeChooserAndroid::CancelDialog(JNIEnv* env, jobject) {
   host_->Send(new ViewMsg_CancelDateTimeDialog(host_->GetRoutingID()));
 }
 
 void DateTimeChooserAndroid::ShowDialog(
-    ContentViewCore* content,
+    gfx::NativeWindow native_window,
     RenderViewHost* host,
     ui::TextInputType dialog_type,
     double dialog_value,
     double min,
     double max,
     double step,
     const std::vector<DateTimeSuggestion>& suggestions) {
   host_ = host;
 
   JNIEnv* env = AttachCurrentThread();
@@ skipping 10 matching lines @@
       ScopedJavaLocalRef<jstring> label = ConvertUTF16ToJavaString(
           env, SanitizeSuggestionString(suggestion.label));
       Java_DateTimeChooserAndroid_setDateTimeSuggestionAt(env,
           suggestions_array.obj(), i,
           suggestion.value, localized_value.obj(), label.obj());
     }
   }
 
   j_date_time_chooser_.Reset(Java_DateTimeChooserAndroid_createDateTimeChooser(
       env,
-      content->GetJavaObject().obj(),
+      native_window->GetJavaObject().obj(),
       reinterpret_cast<intptr_t>(this),
       dialog_type,
       dialog_value,
       min,
       max,
       step,
       suggestions_array.obj()));
+  if (j_date_time_chooser_.is_null())
+    ReplaceDateTime(env, j_date_time_chooser_.obj(), dialog_value);
 }
 
 // ----------------------------------------------------------------------------
 // Native JNI methods
 // ----------------------------------------------------------------------------
 bool RegisterDateTimeChooserAndroid(JNIEnv* env) {
   bool registered = RegisterNativesImpl(env);
   if (registered)
     DateTimeChooserAndroid::InitializeDateInputTypes(
         ui::TEXT_INPUT_TYPE_DATE,
         ui::TEXT_INPUT_TYPE_DATE_TIME,
         ui::TEXT_INPUT_TYPE_DATE_TIME_LOCAL,
         ui::TEXT_INPUT_TYPE_MONTH,
         ui::TEXT_INPUT_TYPE_TIME,
         ui::TEXT_INPUT_TYPE_WEEK);
   return registered;
 }
 
 }  // namespace content