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

Unified Diff: ui/views/controls/combobox/native_combobox_views_unittest.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_unittest.cc
===================================================================
--- ui/views/controls/combobox/native_combobox_views_unittest.cc (revision 150588)
+++ ui/views/controls/combobox/native_combobox_views_unittest.cc (working copy)
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/utf_string_conversions.h"
+#include "ui/base/event.h"
#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/models/combobox_model.h"
#include "ui/views/controls/combobox/combobox.h"
@@ -24,13 +25,13 @@
key_received_(false) {
}
- virtual bool OnKeyPressed(const views::KeyEvent& e) OVERRIDE {
+ virtual bool OnKeyPressed(const ui::KeyEvent& e) OVERRIDE {
key_received_ = true;
key_handled_ = views::Combobox::OnKeyPressed(e);
return key_handled_;
}
- virtual bool OnKeyReleased(const views::KeyEvent& e) OVERRIDE {
+ virtual bool OnKeyReleased(const ui::KeyEvent& e) OVERRIDE {
key_received_ = true;
key_handled_ = views::Combobox::OnKeyReleased(e);
return key_handled_;
@@ -123,7 +124,7 @@
protected:
void SendKeyEvent(ui::KeyboardCode key_code) {
- KeyEvent event(ui::ET_KEY_PRESSED, key_code, 0);
+ ui::KeyEvent event(ui::ET_KEY_PRESSED, key_code, 0);
input_method_->DispatchKeyEvent(event);
}
« no previous file with comments | « ui/views/controls/combobox/native_combobox_views.cc ('k') | ui/views/controls/combobox/native_combobox_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698