Make BaseChooserOnlyDateAndTimeInputType a subclass of InputTypeView.

third_party/WebKit/Source/core/html/forms/BaseChooserOnlyDateAndTimeInputType.h

Index: third_party/WebKit/Source/core/html/forms/BaseChooserOnlyDateAndTimeInputType.h
diff --git a/third_party/WebKit/Source/core/html/forms/BaseChooserOnlyDateAndTimeInputType.h b/third_party/WebKit/Source/core/html/forms/BaseChooserOnlyDateAndTimeInputType.h
index 7a6ddc03abae61c54001906a46b6fdf599c63e6b..cffe452395903a7b7c4f3525af3eac4c6bd7b6a5 100644
--- a/third_party/WebKit/Source/core/html/forms/BaseChooserOnlyDateAndTimeInputType.h
+++ b/third_party/WebKit/Source/core/html/forms/BaseChooserOnlyDateAndTimeInputType.h
@@ -26,9 +26,6 @@
 #ifndef BaseChooserOnlyDateAndTimeInputType_h
 #define BaseChooserOnlyDateAndTimeInputType_h
 
-#include "wtf/build_config.h"
-
-#if !ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include "core/html/forms/BaseClickableWithKeyInputType.h"
 #include "core/html/forms/BaseDateAndTimeInputType.h"
 #include "core/html/forms/DateTimeChooser.h"
@@ -37,16 +34,17 @@
 
 namespace blink {
 
-class BaseChooserOnlyDateAndTimeInputType : public BaseDateAndTimeInputType, public DateTimeChooserClient {
+// TODO(tkent): Rename this to ChooserOnlyDateAndTimeInputTypeView.

[tkent, 2016/04/19 08:29:47]

or, rename all of "DateAndTime" to "Temporal".  WDYT?

[tkent, 2016/04/19 12:30:32]

I meant renaming this to ChooserOnlyDateAndTimeInputTypeView, or this to
ChooserOnlyTemporalInputTypeView AND other FooDateAndTimeBar to FooTemoralBar.

[keishi, 2016/04/19 13:05:02]

These are input fields that accept some temporal expressions so I think that
makes sense.

+class BaseChooserOnlyDateAndTimeInputType final : public InputTypeView, public DateTimeChooserClient {
     USING_GARBAGE_COLLECTED_MIXIN(BaseChooserOnlyDateAndTimeInputType);
     USING_PRE_FINALIZER(BaseChooserOnlyDateAndTimeInputType, closeDateTimeChooser);
-protected:
-    BaseChooserOnlyDateAndTimeInputType(HTMLInputElement&);
+public:
+    static BaseChooserOnlyDateAndTimeInputType* create(HTMLInputElement&, BaseDateAndTimeInputType&);
     ~BaseChooserOnlyDateAndTimeInputType() override;
-
     DECLARE_VIRTUAL_TRACE();
 
 private:
+    BaseChooserOnlyDateAndTimeInputType(HTMLInputElement&, BaseDateAndTimeInputType&);
     void closeDateTimeChooser();
 
     // InputTypeView functions:
@@ -66,10 +64,10 @@ private:
     void didChooseValue(double) override;
     void didEndChooser() override;
 
+    Member<BaseDateAndTimeInputType> m_inputType;
     Member<DateTimeChooser> m_dateTimeChooser;
 };
 
 } // namespace blink
 
-#endif // ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #endif // BaseChooserOnlyDateAndTimeInputType_h