chrome/browser/chromeos/login/wizard_controller.cc - Issue 6246001: Move app/key* to ui/base/keycodes/*

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/wizard_controller.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

« no previous file with comments | « chrome/browser/chromeos/login/wizard_accessibility_helper.cc ('k') | chrome/browser/chromeos/login/wizard_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/wizard_controller.cc

===================================================================

--- chrome/browser/chromeos/login/wizard_controller.cc (revision 71220)

+++ chrome/browser/chromeos/login/wizard_controller.cc (working copy)

@@ -83,24 +83,24 @@

: accel_toggle_accessibility_(

chromeos::WizardAccessibilityHelper::GetAccelerator()) {

#if defined(OFFICIAL_BUILD)

- accel_cancel_update_ = views::Accelerator(app::VKEY_ESCAPE,

+ accel_cancel_update_ = views::Accelerator(ui::VKEY_ESCAPE,

true, true, true);

#else

- accel_cancel_update_ = views::Accelerator(app::VKEY_ESCAPE,

+ accel_cancel_update_ = views::Accelerator(ui::VKEY_ESCAPE,

false, false, false);

- accel_account_screen_ = views::Accelerator(app::VKEY_A,

+ accel_account_screen_ = views::Accelerator(ui::VKEY_A,

false, true, true);

- accel_login_screen_ = views::Accelerator(app::VKEY_L,

+ accel_login_screen_ = views::Accelerator(ui::VKEY_L,

false, true, true);

- accel_network_screen_ = views::Accelerator(app::VKEY_N,

+ accel_network_screen_ = views::Accelerator(ui::VKEY_N,

false, true, true);

- accel_update_screen_ = views::Accelerator(app::VKEY_U,

+ accel_update_screen_ = views::Accelerator(ui::VKEY_U,

false, true, true);

- accel_image_screen_ = views::Accelerator(app::VKEY_I,

+ accel_image_screen_ = views::Accelerator(ui::VKEY_I,

false, true, true);

- accel_eula_screen_ = views::Accelerator(app::VKEY_E,

+ accel_eula_screen_ = views::Accelerator(ui::VKEY_E,

false, true, true);

- accel_register_screen_ = views::Accelerator(app::VKEY_R,

+ accel_register_screen_ = views::Accelerator(ui::VKEY_R,

false, true, true);

AddAccelerator(accel_account_screen_);

AddAccelerator(accel_login_screen_);