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

Unified Diff: chrome/browser/chromeos/login/new_user_view.cc

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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: chrome/browser/chromeos/login/new_user_view.cc
===================================================================
--- chrome/browser/chromeos/login/new_user_view.cc (revision 71220)
+++ chrome/browser/chromeos/login/new_user_view.cc (working copy)
@@ -10,7 +10,6 @@
#include <algorithm>
#include <vector>
-#include "app/keyboard_codes.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/callback.h"
@@ -29,6 +28,7 @@
#include "grit/app_resources.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
+#include "ui/base/keycodes/keyboard_codes.h"
#include "views/controls/label.h"
#include "views/controls/throbber.h"
#include "views/widget/widget_gtk.h"
@@ -81,7 +81,7 @@
// Overridden from views::View:
virtual bool OnKeyPressed(const views::KeyEvent& e) {
- if (e.GetKeyCode() == app::VKEY_LEFT) {
+ if (e.GetKeyCode() == ui::VKEY_LEFT) {
return controller_->NavigateAway();
}
return false;
@@ -111,10 +111,10 @@
create_account_link_(NULL),
guest_link_(NULL),
languages_menubutton_(NULL),
- accel_focus_pass_(views::Accelerator(app::VKEY_P, false, false, true)),
- accel_focus_user_(views::Accelerator(app::VKEY_U, false, false, true)),
+ accel_focus_pass_(views::Accelerator(ui::VKEY_P, false, false, true)),
+ accel_focus_user_(views::Accelerator(ui::VKEY_U, false, false, true)),
accel_login_off_the_record_(
- views::Accelerator(app::VKEY_B, false, false, true)),
+ views::Accelerator(ui::VKEY_B, false, false, true)),
accel_toggle_accessibility_(WizardAccessibilityHelper::GetAccelerator()),
delegate_(delegate),
ALLOW_THIS_IN_INITIALIZER_LIST(focus_grabber_factory_(this)),
@@ -530,7 +530,7 @@
if (!CrosLibrary::Get()->EnsureLoaded() || login_in_process_)
return false;
- if (key_event.GetKeyCode() == app::VKEY_RETURN) {
+ if (key_event.GetKeyCode() == ui::VKEY_RETURN) {
if (!username_field_->text().empty() && !password_field_->text().empty())
Login();
// Return true so that processing ends
« no previous file with comments | « chrome/browser/chromeos/login/guest_user_view.cc ('k') | chrome/browser/chromeos/login/password_changed_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698