| Index: chrome/browser/chromeos/login/ui/input_events_blocker.cc
|
| diff --git a/chrome/browser/chromeos/login/ui/input_events_blocker.cc b/chrome/browser/chromeos/login/ui/input_events_blocker.cc
|
| index 686c9070fde532f1a4f327d0040f40797effffa8..b91d7f6c42aabe0d785d94a829b64d629140ff13 100644
|
| --- a/chrome/browser/chromeos/login/ui/input_events_blocker.cc
|
| +++ b/chrome/browser/chromeos/login/ui/input_events_blocker.cc
|
| @@ -6,18 +6,29 @@
|
|
|
| #include "ash/shell.h"
|
| #include "base/logging.h"
|
| +#include "chrome/browser/ui/ash/ash_util.h"
|
| #include "ui/events/event.h"
|
|
|
| namespace chromeos {
|
|
|
| InputEventsBlocker::InputEventsBlocker() {
|
| - ash::Shell::GetInstance()->PrependPreTargetHandler(this);
|
| - VLOG(1) << "InputEventsBlocker " << this << " created.";
|
| + // TODO(mash): Implement a mash version. This will probably need to talk to
|
| + // the window server.
|
| + if (!chrome::IsRunningInMash()) {
|
| + ash::Shell::GetInstance()->PrependPreTargetHandler(this);
|
| + VLOG(1) << "InputEventsBlocker " << this << " created.";
|
| + } else {
|
| + NOTIMPLEMENTED();
|
| + }
|
| }
|
|
|
| InputEventsBlocker::~InputEventsBlocker() {
|
| - ash::Shell::GetInstance()->RemovePreTargetHandler(this);
|
| - VLOG(1) << "InputEventsBlocker " << this << " destroyed.";
|
| + if (!chrome::IsRunningInMash()) {
|
| + ash::Shell::GetInstance()->RemovePreTargetHandler(this);
|
| + VLOG(1) << "InputEventsBlocker " << this << " destroyed.";
|
| + } else {
|
| + NOTIMPLEMENTED();
|
| + }
|
| }
|
|
|
| void InputEventsBlocker::OnKeyEvent(ui::KeyEvent* event) {
|
|
|