summaryrefslogtreecommitdiffstats
path: root/views/accelerator.h
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-08 16:28:44 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-08 16:28:44 +0000
commit0e0e6d757d44f0b0a3678a714c0c09186e3aa6eb (patch)
treea2bcf52eaa02b828865954b6fb800fccee08463b /views/accelerator.h
parentb57c599f4d27dbd93db10033d599fbb512611788 (diff)
downloadchromium_src-0e0e6d757d44f0b0a3678a714c0c09186e3aa6eb.zip
chromium_src-0e0e6d757d44f0b0a3678a714c0c09186e3aa6eb.tar.gz
chromium_src-0e0e6d757d44f0b0a3678a714c0c09186e3aa6eb.tar.bz2
Enabling the default button behavior on Linux toolkit_views.
I had to make the KeyEvent constructor include the event flags. Also cleaned-up some unit-tests BUG=None TEST=Run the unit-tests. Review URL: http://codereview.chromium.org/266012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28397 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/accelerator.h')
-rw-r--r--views/accelerator.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/views/accelerator.h b/views/accelerator.h
index 1848c98..4aab592 100644
--- a/views/accelerator.h
+++ b/views/accelerator.h
@@ -37,7 +37,7 @@ class Accelerator {
modifiers_ = accelerator.modifiers_;
}
- ~Accelerator() { };
+ ~Accelerator() { }
Accelerator& operator=(const Accelerator& accelerator) {
if (this != &accelerator) {
@@ -79,6 +79,10 @@ class Accelerator {
return key_code_;
}
+ int modifiers() const {
+ return modifiers_;
+ }
+
// Returns a string with the localized shortcut if any.
std::wstring GetShortcutText() const;