Index: ui/views/controls/combobox/native_combobox_views.cc |
=================================================================== |
--- ui/views/controls/combobox/native_combobox_views.cc (revision 150588) |
+++ ui/views/controls/combobox/native_combobox_views.cc (working copy) |
@@ -8,6 +8,7 @@ |
#include "grit/ui_resources.h" |
#include "ui/base/keycodes/keyboard_codes.h" |
+#include "ui/base/event.h" |
#include "ui/base/models/combobox_model.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/gfx/canvas.h" |
@@ -95,7 +96,7 @@ |
return View::OnGestureEvent(gesture_event); |
} |
-bool NativeComboboxViews::OnKeyPressed(const views::KeyEvent& key_event) { |
+bool NativeComboboxViews::OnKeyPressed(const ui::KeyEvent& key_event) { |
// TODO(oshima): handle IME. |
DCHECK_EQ(key_event.type(), ui::ET_KEY_PRESSED); |
@@ -142,7 +143,7 @@ |
return true; |
} |
-bool NativeComboboxViews::OnKeyReleased(const views::KeyEvent& key_event) { |
+bool NativeComboboxViews::OnKeyReleased(const ui::KeyEvent& key_event) { |
return true; |
} |
@@ -226,11 +227,11 @@ |
text_border_->set_has_focus(true); |
} |
-bool NativeComboboxViews::HandleKeyPressed(const KeyEvent& e) { |
+bool NativeComboboxViews::HandleKeyPressed(const ui::KeyEvent& e) { |
return OnKeyPressed(e); |
} |
-bool NativeComboboxViews::HandleKeyReleased(const KeyEvent& e) { |
+bool NativeComboboxViews::HandleKeyReleased(const ui::KeyEvent& e) { |
return false; // crbug.com/127520 |
} |