Mandoline: Enable Android software keyboard for the Omnibox.

mojo/converters/ime/ime_type_converters.cc

Index: mojo/converters/ime/ime_type_converters.cc
diff --git a/components/view_manager/type_converters.cc b/mojo/converters/ime/ime_type_converters.cc
similarity index 74%
rename from components/view_manager/type_converters.cc
rename to mojo/converters/ime/ime_type_converters.cc
index 4f0d6ae83572f4d2ba75439fd0a0f6c17012c4f0..9a59f2fff5f0ff5c45e499e93685e38162b299b7 100644
--- a/components/view_manager/type_converters.cc
+++ b/mojo/converters/ime/ime_type_converters.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/view_manager/type_converters.h"
+#include "mojo/converters/ime/ime_type_converters.h"
 
 #include "base/basictypes.h"
 #include "base/macros.h"
@@ -28,24 +28,28 @@ TEXT_INPUT_TYPE_ASSERT(MONTH);
 TEXT_INPUT_TYPE_ASSERT(TIME);
 TEXT_INPUT_TYPE_ASSERT(WEEK);
 TEXT_INPUT_TYPE_ASSERT(TEXT_AREA);
-TEXT_INPUT_TYPE_ASSERT(LAST);
 
 #define TEXT_INPUT_FLAG_ASSERT(NAME) \
   COMPILE_ASSERT(static_cast<int32>(TEXT_INPUT_FLAG_##NAME) == \
                  static_cast<int32>(ui::TEXT_INPUT_FLAG_##NAME), \
                  text_input_flag_should_match)
 TEXT_INPUT_FLAG_ASSERT(NONE);
-TEXT_INPUT_FLAG_ASSERT(AUTO_COMPLETE_ON);
-TEXT_INPUT_FLAG_ASSERT(AUTO_COMPLETE_OFF);
-TEXT_INPUT_FLAG_ASSERT(AUTO_CORRECT_ON);
-TEXT_INPUT_FLAG_ASSERT(AUTO_CORRECT_OFF);
-TEXT_INPUT_FLAG_ASSERT(SPELL_CHECK_ON);
-TEXT_INPUT_FLAG_ASSERT(SPELL_CHECK_OFF);
-TEXT_INPUT_FLAG_ASSERT(AUTO_CAPITALIZE_NONE);
-TEXT_INPUT_FLAG_ASSERT(AUTO_CAPITALIZE_CHARACTERS);
-TEXT_INPUT_FLAG_ASSERT(AUTO_CAPITALIZE_WORDS);
-TEXT_INPUT_FLAG_ASSERT(AUTO_CAPITALIZE_SENTENCES);
-TEXT_INPUT_FLAG_ASSERT(ALL);
+TEXT_INPUT_FLAG_ASSERT(AUTOCOMPLETE_ON);
+TEXT_INPUT_FLAG_ASSERT(AUTOCOMPLETE_OFF);
+TEXT_INPUT_FLAG_ASSERT(AUTOCORRECT_ON);
+TEXT_INPUT_FLAG_ASSERT(AUTOCORRECT_OFF);
+TEXT_INPUT_FLAG_ASSERT(SPELLCHECK_ON);
+TEXT_INPUT_FLAG_ASSERT(SPELLCHECK_OFF);
+TEXT_INPUT_FLAG_ASSERT(AUTOCAPITALIZE_NONE);
+TEXT_INPUT_FLAG_ASSERT(AUTOCAPITALIZE_CHARACTERS);
+TEXT_INPUT_FLAG_ASSERT(AUTOCAPITALIZE_WORDS);
+TEXT_INPUT_FLAG_ASSERT(AUTOCAPITALIZE_SENTENCES);
+
+// static
+TextInputType TypeConverter<TextInputType, ui::TextInputType>::Convert(
+    const ui::TextInputType& input) {
+  return static_cast<TextInputType>(input);
+}
 
 // static
 ui::TextInputType TypeConverter<ui::TextInputType, TextInputType>::Convert(