diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 15:22:11 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 15:22:11 +0000 |
| commit | 312b5121aadac921a3039111d1350d0594369fb1 (patch) | |
| tree | ff82f92acfcac900ed3a3c48ad6dcf6e686b9573 /views/accelerator.h | |
| parent | 3e2bca105c2254e5d387103ad940eb7a3ac56b27 (diff) | |
| download | chromium_src-312b5121aadac921a3039111d1350d0594369fb1.zip chromium_src-312b5121aadac921a3039111d1350d0594369fb1.tar.gz chromium_src-312b5121aadac921a3039111d1350d0594369fb1.tar.bz2 | |
Tweaks for the merged menu:
. makes the menu show the same fonts regardless of whether the item
has children.
. adds text color to MenuConfig. I'm going to use this for the buttons
added to the menu.
. Changes TextButton to update text_size_ when the font changes.
. Changes TextButton to allow you to specify how accelerators are
shown.
. Nukes TextButton::OnMousePressed as it's not needed (super
implementation does the right thing and updates state the
TextButton::OnMousePressed wasn't).
. Changes accelerator to have constructor taking keycode and modifiers.
BUG=45734
TEST=none
Review URL: http://codereview.chromium.org/2833013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50108 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/accelerator.h')
| -rw-r--r-- | views/accelerator.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/views/accelerator.h b/views/accelerator.h index a54a431..9296e88 100644 --- a/views/accelerator.h +++ b/views/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. @@ -22,6 +22,9 @@ class Accelerator : public menus::Accelerator { public: Accelerator() : menus::Accelerator() {} + Accelerator(base::KeyboardCode keycode, int modifiers) + : menus::Accelerator(keycode, modifiers) {} + Accelerator(base::KeyboardCode keycode, bool shift_pressed, bool ctrl_pressed, bool alt_pressed) { key_code_ = keycode; |