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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h" 5 #include "ash/aura/key_event_watcher_aura.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ui/events/event.h" 8 #include "ui/events/event.h"
9 9
10 namespace ash { 10 namespace ash {
11 namespace wm {
12 11
13 MaximizeModeEventHandlerAura::MaximizeModeEventHandlerAura() { 12 KeyEventWatcherAura::KeyEventWatcherAura() {
14 Shell::GetInstance()->AddPreTargetHandler(this); 13 Shell::GetInstance()->AddPreTargetHandler(this);
15 } 14 }
16 15
17 MaximizeModeEventHandlerAura::~MaximizeModeEventHandlerAura() { 16 KeyEventWatcherAura::~KeyEventWatcherAura() {
18 Shell::GetInstance()->RemovePreTargetHandler(this); 17 Shell::GetInstance()->RemovePreTargetHandler(this);
19 } 18 }
20 19
21 void MaximizeModeEventHandlerAura::OnTouchEvent(ui::TouchEvent* event) { 20 void KeyEventWatcherAura::OnKeyEvent(ui::KeyEvent* event) {
22 if (ToggleFullscreen(*event)) 21 if (HandleKeyEvent(*event))
23 event->StopPropagation(); 22 event->StopPropagation();
24 } 23 }
25 24
26 } // namespace wm
27 } // namespace ash 25 } // namespace ash
OLDNEW
« 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