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

Unified Diff: ui/views/controls/combobox/combobox.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
« no previous file with comments | « ui/views/controls/combobox/combobox.h ('k') | ui/views/controls/combobox/native_combobox_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/combobox/combobox.cc
===================================================================
--- ui/views/controls/combobox/combobox.cc (revision 150588)
+++ ui/views/controls/combobox/combobox.cc (working copy)
@@ -7,6 +7,7 @@
#include "base/logging.h"
#include "base/utf_string_conversions.h"
#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/base/event.h"
#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/models/combobox_model.h"
#include "ui/base/resource/resource_bundle.h"
@@ -91,7 +92,7 @@
// VKEY_ESCAPE should be handled by this view when the drop down list is active.
// In other words, the list should be closed instead of the dialog.
-bool Combobox::SkipDefaultKeyEventProcessing(const KeyEvent& e) {
+bool Combobox::SkipDefaultKeyEventProcessing(const ui::KeyEvent& e) {
if (e.key_code() != ui::VKEY_ESCAPE ||
e.IsShiftDown() || e.IsControlDown() || e.IsAltDown()) {
return false;
@@ -104,11 +105,11 @@
View::OnPaintFocusBorder(canvas);
}
-bool Combobox::OnKeyPressed(const views::KeyEvent& e) {
+bool Combobox::OnKeyPressed(const ui::KeyEvent& e) {
return native_wrapper_ && native_wrapper_->HandleKeyPressed(e);
}
-bool Combobox::OnKeyReleased(const views::KeyEvent& e) {
+bool Combobox::OnKeyReleased(const ui::KeyEvent& e) {
return native_wrapper_ && native_wrapper_->HandleKeyReleased(e);
}
« no previous file with comments | « ui/views/controls/combobox/combobox.h ('k') | ui/views/controls/combobox/native_combobox_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698