summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/menus/accelerator.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/app/menus/accelerator.h b/app/menus/accelerator.h
index 1d659a4..0cb6279 100644
--- a/app/menus/accelerator.h
+++ b/app/menus/accelerator.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -14,13 +14,19 @@ namespace menus {
class Accelerator {
public:
- Accelerator() : key_code_(base::VKEY_UNKNOWN), modifiers_(0) { }
- virtual ~Accelerator() { }
+ Accelerator() : key_code_(base::VKEY_UNKNOWN), modifiers_(0) {}
+
+ Accelerator(base::KeyboardCode keycode, int modifiers)
+ : key_code_(keycode),
+ modifiers_(modifiers) {}
+
Accelerator(const Accelerator& accelerator) {
key_code_ = accelerator.key_code_;
modifiers_ = accelerator.modifiers_;
}
+ virtual ~Accelerator() {}
+
Accelerator& operator=(const Accelerator& accelerator) {
if (this != &accelerator) {
key_code_ = accelerator.key_code_;
@@ -54,7 +60,7 @@ class Accelerator {
}
protected:
- // The window keycode (VK_...).
+ // The keycode (VK_...).
base::KeyboardCode key_code_;
// The state of the Shift/Ctrl/Alt keys (platform-dependent).