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

Unified Diff: ash/aura/key_event_watcher_aura.cc

Issue 2330403002: Do not activate system tray bubble by default (Closed)
Patch Set: Do not activate system tray bubble by default Created 4 years, 3 months 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 | « ash/aura/key_event_watcher_aura.h ('k') | ash/aura/wm_shell_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/key_event_watcher_aura.cc
diff --git a/ash/wm/maximize_mode/maximize_mode_event_handler_aura.cc b/ash/aura/key_event_watcher_aura.cc
similarity index 54%
copy from ash/wm/maximize_mode/maximize_mode_event_handler_aura.cc
copy to ash/aura/key_event_watcher_aura.cc
index 749d2497636a1014e9288c461a6581aa81c80724..66a8a8d92f83d1c4e3bcfe7ec930e376e05753a9 100644
--- a/ash/wm/maximize_mode/maximize_mode_event_handler_aura.cc
+++ b/ash/aura/key_event_watcher_aura.cc
@@ -2,26 +2,24 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h"
+#include "ash/aura/key_event_watcher_aura.h"
#include "ash/shell.h"
#include "ui/events/event.h"
namespace ash {
-namespace wm {
-MaximizeModeEventHandlerAura::MaximizeModeEventHandlerAura() {
+KeyEventWatcherAura::KeyEventWatcherAura() {
Shell::GetInstance()->AddPreTargetHandler(this);
}
-MaximizeModeEventHandlerAura::~MaximizeModeEventHandlerAura() {
+KeyEventWatcherAura::~KeyEventWatcherAura() {
Shell::GetInstance()->RemovePreTargetHandler(this);
}
-void MaximizeModeEventHandlerAura::OnTouchEvent(ui::TouchEvent* event) {
- if (ToggleFullscreen(*event))
+void KeyEventWatcherAura::OnKeyEvent(ui::KeyEvent* event) {
+ if (HandleKeyEvent(*event))
event->StopPropagation();
}
-} // namespace wm
} // namespace ash
« no previous file with comments | « ash/aura/key_event_watcher_aura.h ('k') | ash/aura/wm_shell_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698