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

Unified Diff: ui/views/controls/link.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/link.h ('k') | ui/views/controls/menu/submenu_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/link.cc
===================================================================
--- ui/views/controls/link.cc (revision 150588)
+++ ui/views/controls/link.cc (working copy)
@@ -9,6 +9,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/gfx/color_utils.h"
#include "ui/gfx/font.h"
@@ -94,7 +95,7 @@
SetPressed(false);
}
-bool Link::OnKeyPressed(const KeyEvent& event) {
+bool Link::OnKeyPressed(const ui::KeyEvent& event) {
bool activate = ((event.key_code() == ui::VKEY_SPACE) ||
(event.key_code() == ui::VKEY_RETURN));
if (!activate)
@@ -128,7 +129,7 @@
return ui::GESTURE_STATUS_CONSUMED;
}
-bool Link::SkipDefaultKeyEventProcessing(const KeyEvent& event) {
+bool Link::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
// Make sure we don't process space or enter as accelerators.
return (event.key_code() == ui::VKEY_SPACE) ||
(event.key_code() == ui::VKEY_RETURN);
« no previous file with comments | « ui/views/controls/link.h ('k') | ui/views/controls/menu/submenu_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698