Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4230)

Unified Diff: chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc

Issue 1055673002: [Extensions API] Remove inline enums (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Latest master Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc
diff --git a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc
index 0e486fd7f20383992620b0487db4583d3f9d6aad..d999706b58b87e73bf78a5f61c3080e8d785a4ec 100644
--- a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc
+++ b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc
@@ -36,22 +36,23 @@ namespace {
const char* kVirtualKeyboardExtensionID = "mppnpdlheglhdfmldimlhpnegondlapf";
-Context::Type TextInputTypeToGeneratedInputTypeEnum(ui::TextInputType type) {
+virtual_keyboard_private::OnTextInputBoxFocusedType
+TextInputTypeToGeneratedInputTypeEnum(ui::TextInputType type) {
switch (type) {
case ui::TEXT_INPUT_TYPE_NONE:
- return Context::TYPE_NONE;
+ return virtual_keyboard_private::ON_TEXT_INPUT_BOX_FOCUSED_TYPE_NONE;
case ui::TEXT_INPUT_TYPE_PASSWORD:
- return Context::TYPE_PASSWORD;
+ return virtual_keyboard_private::ON_TEXT_INPUT_BOX_FOCUSED_TYPE_PASSWORD;
case ui::TEXT_INPUT_TYPE_EMAIL:
- return Context::TYPE_EMAIL;
+ return virtual_keyboard_private::ON_TEXT_INPUT_BOX_FOCUSED_TYPE_EMAIL;
case ui::TEXT_INPUT_TYPE_NUMBER:
- return Context::TYPE_NUMBER;
+ return virtual_keyboard_private::ON_TEXT_INPUT_BOX_FOCUSED_TYPE_NUMBER;
case ui::TEXT_INPUT_TYPE_TELEPHONE:
- return Context::TYPE_TEL;
+ return virtual_keyboard_private::ON_TEXT_INPUT_BOX_FOCUSED_TYPE_TEL;
case ui::TEXT_INPUT_TYPE_URL:
- return Context::TYPE_URL;
+ return virtual_keyboard_private::ON_TEXT_INPUT_BOX_FOCUSED_TYPE_URL;
case ui::TEXT_INPUT_TYPE_DATE:
- return Context::TYPE_DATE;
+ return virtual_keyboard_private::ON_TEXT_INPUT_BOX_FOCUSED_TYPE_DATE;
case ui::TEXT_INPUT_TYPE_TEXT:
case ui::TEXT_INPUT_TYPE_SEARCH:
case ui::TEXT_INPUT_TYPE_DATE_TIME:
@@ -62,10 +63,10 @@ Context::Type TextInputTypeToGeneratedInputTypeEnum(ui::TextInputType type) {
case ui::TEXT_INPUT_TYPE_TEXT_AREA:
case ui::TEXT_INPUT_TYPE_CONTENT_EDITABLE:
case ui::TEXT_INPUT_TYPE_DATE_TIME_FIELD:
- return Context::TYPE_TEXT;
+ return virtual_keyboard_private::ON_TEXT_INPUT_BOX_FOCUSED_TYPE_TEXT;
}
NOTREACHED();
- return Context::TYPE_NONE;
+ return virtual_keyboard_private::ON_TEXT_INPUT_BOX_FOCUSED_TYPE_NONE;
}
} // namespace
@@ -171,7 +172,8 @@ void AshKeyboardControllerProxy::SetUpdateInputType(ui::TextInputType type) {
scoped_ptr<base::ListValue> event_args(new base::ListValue());
scoped_ptr<base::DictionaryValue> input_context(new base::DictionaryValue());
input_context->SetString("type",
- Context::ToString(TextInputTypeToGeneratedInputTypeEnum(type)));
+ virtual_keyboard_private::ToString(
+ TextInputTypeToGeneratedInputTypeEnum(type)));
event_args->Append(input_context.release());
scoped_ptr<extensions::Event> event(new extensions::Event(

Powered by Google App Engine
This is Rietveld 408576698