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

Unified Diff: ui/views/controls/combobox/native_combobox_views.cc

Issue 10825254: Remove views::KeyEvent, replacing uses of it with ui::KeyEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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: 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
}
« no previous file with comments | « ui/views/controls/combobox/native_combobox_views.h ('k') | ui/views/controls/combobox/native_combobox_views_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698