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

Unified Diff: views/accelerator.h

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: 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
« no previous file with comments | « ui/base/models/accelerator.h ('k') | views/bubble/bubble_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_
« no previous file with comments | « ui/base/models/accelerator.h ('k') | views/bubble/bubble_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698