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

Unified Diff: chrome/browser/chromeos/login/ui/input_events_blocker.cc

Issue 2536113003: chromeos: Make InputEventsBlocker NOTIMPLEMENTED for mash (Closed)
Patch Set: Created 4 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 | « chrome/browser/chromeos/login/session/user_session_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « chrome/browser/chromeos/login/session/user_session_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698