Index: views/accelerator.h |
diff --git a/views/accelerator.h b/views/accelerator.h |
index 3dc2f0e900ab7fb62b7f49e152501e034cc3d1ec..d95d7236d87023d8dc981285ba86b41de1c59a19 100644 |
--- a/views/accelerator.h |
+++ b/views/accelerator.h |
@@ -29,45 +29,15 @@ class VIEWS_EXPORT Accelerator : public ui::Accelerator { |
: ui::Accelerator(keycode, modifiers) {} |
Accelerator(ui::KeyboardCode keycode, |
- bool shift_pressed, bool ctrl_pressed, bool alt_pressed) { |
- key_code_ = keycode; |
- modifiers_ = 0; |
- if (shift_pressed) |
- modifiers_ |= ui::EF_SHIFT_DOWN; |
- if (ctrl_pressed) |
- modifiers_ |= ui::EF_CONTROL_DOWN; |
- if (alt_pressed) |
- modifiers_ |= ui::EF_ALT_DOWN; |
- } |
+ bool shift_pressed, bool ctrl_pressed, bool alt_pressed) |
+ : ui::Accelerator(keycode, shift_pressed, ctrl_pressed, alt_pressed) {} |
virtual ~Accelerator() {} |
- bool IsShiftDown() const { |
- return (modifiers_ & ui::EF_SHIFT_DOWN) == ui::EF_SHIFT_DOWN; |
- } |
- |
- bool IsCtrlDown() const { |
- return (modifiers_ & ui::EF_CONTROL_DOWN) == ui::EF_CONTROL_DOWN; |
- } |
- |
- bool IsAltDown() const { |
- return (modifiers_ & ui::EF_ALT_DOWN) == ui::EF_ALT_DOWN; |
- } |
- |
// Returns a string with the localized shortcut if any. |
string16 GetShortcutText() const; |
}; |
-// An interface that classes that want to register for keyboard accelerators |
-// should implement. |
-class VIEWS_EXPORT AcceleratorTarget { |
- public: |
- // This method should return true if the accelerator was processed. |
- virtual bool AcceleratorPressed(const Accelerator& accelerator) = 0; |
- |
- protected: |
- virtual ~AcceleratorTarget() {} |
-}; |
} |
#endif // VIEWS_ACCELERATOR_H_ |