| 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/accelerators/key_hold_detector.h" | 5 #include "ash/accelerators/key_hold_detector.h" |
| 6 | 6 |
| 7 #include <X11/Xlib.h> | |
| 8 | |
| 9 #undef RootWindow | |
| 10 #undef Status | |
| 11 | |
| 12 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 13 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 14 #include "ui/aura/window_tracker.h" | 9 #include "ui/aura/window_tracker.h" |
| 15 #include "ui/aura/window_tree_host.h" | 10 #include "ui/aura/window_tree_host.h" |
| 16 #include "ui/events/event_dispatcher.h" | 11 #include "ui/events/event_dispatcher.h" |
| 17 #include "ui/events/event_processor.h" | 12 #include "ui/events/event_processor.h" |
| 18 | 13 |
| 19 namespace ash { | 14 namespace ash { |
| 20 namespace { | 15 namespace { |
| 21 | 16 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 delegate_->OnKeyUnhold(event); | 86 delegate_->OnKeyUnhold(event); |
| 92 event->StopPropagation(); | 87 event->StopPropagation(); |
| 93 break; | 88 break; |
| 94 } | 89 } |
| 95 } | 90 } |
| 96 state_ = INITIAL; | 91 state_ = INITIAL; |
| 97 } | 92 } |
| 98 } | 93 } |
| 99 | 94 |
| 100 } // namespace ash | 95 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1137393004:
Remove stale #include <X11/Xlib.h> to unbreak Freon builds (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master