| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_blocker.h" | 5 #include "ash/wm/maximize_mode/maximize_mode_event_blocker.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "ui/aura/client/cursor_client.h" | 9 #include "ui/aura/client/cursor_client.h" |
| 10 #include "ui/events/event_targeter.h" | 10 #include "ui/events/event_targeter.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 ui::EventTarget* root, | 56 ui::EventTarget* root, |
| 57 ui::Event* event) { | 57 ui::Event* event) { |
| 58 if (event->HasNativeEvent()) { | 58 if (event->HasNativeEvent()) { |
| 59 if (event->IsMouseEvent()) | 59 if (event->IsMouseEvent()) |
| 60 return NULL; | 60 return NULL; |
| 61 if (event->IsKeyEvent()) { | 61 if (event->IsKeyEvent()) { |
| 62 // TODO(bruthig): Fix this to block rewritten volume keys | 62 // TODO(bruthig): Fix this to block rewritten volume keys |
| 63 // (i.e. F9 and F10) from the device's keyboard. https://crbug.com/368669 | 63 // (i.e. F9 and F10) from the device's keyboard. https://crbug.com/368669 |
| 64 ui::KeyEvent* key_event = static_cast<ui::KeyEvent*>(event); | 64 ui::KeyEvent* key_event = static_cast<ui::KeyEvent*>(event); |
| 65 if (key_event->key_code() != ui::VKEY_VOLUME_DOWN && | 65 if (key_event->key_code() != ui::VKEY_VOLUME_DOWN && |
| 66 key_event->key_code() != ui::VKEY_VOLUME_UP) { | 66 key_event->key_code() != ui::VKEY_VOLUME_UP |
| 67 #if defined(OS_CHROMEOS) |
| 68 && key_event->key_code() != ui::VKEY_POWER |
| 69 #endif |
| 70 ) { |
| 67 return NULL; | 71 return NULL; |
| 68 } | 72 } |
| 69 } | 73 } |
| 70 } | 74 } |
| 71 return default_targeter_->FindTargetForEvent(root, event); | 75 return default_targeter_->FindTargetForEvent(root, event); |
| 72 } | 76 } |
| 73 | 77 |
| 74 } // namespace | 78 } // namespace |
| 75 | 79 |
| 76 MaximizeModeEventBlocker::MaximizeModeEventBlocker() { | 80 MaximizeModeEventBlocker::MaximizeModeEventBlocker() { |
| (...skipping 26 matching lines...) Expand all Loading... |
| 103 aura::Window* root_window) { | 107 aura::Window* root_window) { |
| 104 BlockKeyboardAndTouchpadTargeter* targeter = | 108 BlockKeyboardAndTouchpadTargeter* targeter = |
| 105 new BlockKeyboardAndTouchpadTargeter(); | 109 new BlockKeyboardAndTouchpadTargeter(); |
| 106 aura::ScopedWindowTargeter* scoped_targeter = new aura::ScopedWindowTargeter( | 110 aura::ScopedWindowTargeter* scoped_targeter = new aura::ScopedWindowTargeter( |
| 107 root_window, scoped_ptr<ui::EventTargeter>(targeter)); | 111 root_window, scoped_ptr<ui::EventTargeter>(targeter)); |
| 108 targeter->SetDefaultTargeter(scoped_targeter->old_targeter()); | 112 targeter->SetDefaultTargeter(scoped_targeter->old_targeter()); |
| 109 targeters_.push_back(scoped_targeter); | 113 targeters_.push_back(scoped_targeter); |
| 110 } | 114 } |
| 111 | 115 |
| 112 } // namespace ash | 116 } // namespace ash |
| OLD | NEW |