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

Unified Diff: ui/views/controls/textfield/native_textfield_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/textfield/native_textfield_views.cc
===================================================================
--- ui/views/controls/textfield/native_textfield_views.cc (revision 150588)
+++ ui/views/controls/textfield/native_textfield_views.cc (working copy)
@@ -18,6 +18,7 @@
#include "third_party/skia/include/core/SkColor.h"
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/base/event.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/range/range.h"
#include "ui/compositor/layer.h"
@@ -180,14 +181,14 @@
return TouchSelectionClientView::OnGestureEvent(event);
}
-bool NativeTextfieldViews::OnKeyPressed(const KeyEvent& event) {
+bool NativeTextfieldViews::OnKeyPressed(const ui::KeyEvent& event) {
// OnKeyPressed/OnKeyReleased/OnFocus/OnBlur will never be invoked on
// NativeTextfieldViews as it will never gain focus.
NOTREACHED();
return false;
}
-bool NativeTextfieldViews::OnKeyReleased(const KeyEvent& event) {
+bool NativeTextfieldViews::OnKeyReleased(const ui::KeyEvent& event) {
NOTREACHED();
return false;
}
@@ -522,7 +523,7 @@
return model_->GetCursorPosition();
}
-bool NativeTextfieldViews::HandleKeyPressed(const KeyEvent& e) {
+bool NativeTextfieldViews::HandleKeyPressed(const ui::KeyEvent& e) {
TextfieldController* controller = textfield_->GetController();
bool handled = false;
if (controller)
@@ -530,7 +531,7 @@
return handled || HandleKeyEvent(e);
}
-bool NativeTextfieldViews::HandleKeyReleased(const KeyEvent& e) {
+bool NativeTextfieldViews::HandleKeyReleased(const ui::KeyEvent& e) {
return false; // crbug.com/127520
}
@@ -916,7 +917,7 @@
canvas->Restore();
}
-bool NativeTextfieldViews::HandleKeyEvent(const KeyEvent& key_event) {
+bool NativeTextfieldViews::HandleKeyEvent(const ui::KeyEvent& key_event) {
// TODO(oshima): Refactor and consolidate with ExecuteCommand.
if (key_event.type() == ui::ET_KEY_PRESSED) {
ui::KeyboardCode key_code = key_event.key_code();
« no previous file with comments | « ui/views/controls/textfield/native_textfield_views.h ('k') | ui/views/controls/textfield/native_textfield_views_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698