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

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

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 9 years, 1 month 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/webui_login_view.cc
diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc
index 25628265ac752df27fb4b0c3ed9936bb68878f0e..589f8be3bd8e85e58b8f7b8d797eb1261f13e1a0 100644
--- a/chrome/browser/chromeos/login/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/webui_login_view.cc
@@ -118,11 +118,11 @@ WebUILoginView::WebUILoginView()
// Make sure the singleton VirtualKeyboardManager object is created.
VirtualKeyboardManager::GetInstance();
#endif
- accel_map_[views::Accelerator(ui::VKEY_Z, false, true, true)] =
+ accel_map_[ui::Accelerator(ui::VKEY_Z, false, true, true)] =
kAccelNameAccessibility;
- accel_map_[views::Accelerator(ui::VKEY_ESCAPE, false, false, false)] =
+ accel_map_[ui::Accelerator(ui::VKEY_ESCAPE, false, false, false)] =
kAccelNameCancel;
- accel_map_[views::Accelerator(ui::VKEY_E, false, true, true)] =
+ accel_map_[ui::Accelerator(ui::VKEY_E, false, true, true)] =
kAccelNameEnrollment;
for (AccelMap::iterator i(accel_map_.begin()); i != accel_map_.end(); ++i)
@@ -153,7 +153,7 @@ std::string WebUILoginView::GetClassName() const {
}
bool WebUILoginView::AcceleratorPressed(
- const views::Accelerator& accelerator) {
+ const ui::Accelerator& accelerator) {
AccelMap::const_iterator entry = accel_map_.find(accelerator);
if (entry == accel_map_.end())
return false;
« no previous file with comments | « chrome/browser/chromeos/login/webui_login_view.h ('k') | chrome/browser/chromeos/login/wizard_accessibility_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698