| Index: ash/sticky_keys/sticky_keys_controller.cc
|
| diff --git a/ash/sticky_keys/sticky_keys_controller.cc b/ash/sticky_keys/sticky_keys_controller.cc
|
| index 919d0a6c51f3ec8504a0c006f86871e2d760091b..68e437d34fd2220fa034c7f6dd70c747a889cbed 100644
|
| --- a/ash/sticky_keys/sticky_keys_controller.cc
|
| +++ b/ash/sticky_keys/sticky_keys_controller.cc
|
| @@ -96,7 +96,9 @@ void StickyKeysHandlerDelegateImpl::DispatchEvent(ui::Event* event,
|
| ///////////////////////////////////////////////////////////////////////////////
|
| // StickyKeys
|
| StickyKeysController::StickyKeysController()
|
| - : enabled_(false) {
|
| + : enabled_(false),
|
| + mod3_enabled_(false),
|
| + altgr_enabled_(false) {
|
| }
|
|
|
| StickyKeysController::~StickyKeysController() {
|
| @@ -123,12 +125,21 @@ void StickyKeysController::Enable(bool enabled) {
|
| new StickyKeysHandlerDelegateImpl()));
|
|
|
| overlay_.reset(new StickyKeysOverlay());
|
| + overlay_->SetModifiersVisible(mod3_enabled_, altgr_enabled_);
|
| } else if (overlay_.get()) {
|
| overlay_->Show(false);
|
| }
|
| }
|
| }
|
|
|
| +void StickyKeysController::SetModifiersEnabled(bool mod3_enabled,
|
| + bool altgr_enabled) {
|
| + mod3_enabled_ = mod3_enabled;
|
| + altgr_enabled_ = altgr_enabled;
|
| + if (overlay_.get())
|
| + overlay_->SetModifiersVisible(mod3_enabled_, altgr_enabled_);
|
| +}
|
| +
|
| bool StickyKeysController::HandleKeyEvent(ui::KeyEvent* event) {
|
| return shift_sticky_key_->HandleKeyEvent(event) ||
|
| alt_sticky_key_->HandleKeyEvent(event) ||
|
|
|