OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/aura/env.h" | 5 #include "ui/aura/env.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "base/threading/thread_local.h" | 10 #include "base/threading/thread_local.h" |
11 #include "ui/aura/client/focus_client.h" | 11 #include "ui/aura/client/focus_client.h" |
12 #include "ui/aura/env_observer.h" | 12 #include "ui/aura/env_observer.h" |
13 #include "ui/aura/input_state_lookup.h" | 13 #include "ui/aura/input_state_lookup.h" |
14 #include "ui/aura/mus/window_port_mus.h" | 14 #include "ui/aura/mus/window_port_mus.h" |
15 #include "ui/aura/mus/window_tree_client.h" | 15 #include "ui/aura/mus/window_tree_client.h" |
16 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
17 #include "ui/aura/window_observer.h" | 17 #include "ui/aura/window_observer.h" |
18 #include "ui/aura/window_port_local.h" | 18 #include "ui/aura/window_port_local.h" |
19 #include "ui/events/event_target_iterator.h" | 19 #include "ui/events/event_target_iterator.h" |
20 #include "ui/events/platform/platform_event_source.h" | 20 #include "ui/events/platform/platform_event_source.h" |
21 #include "ui/gfx/switches.h" | |
sky
2016/12/08 16:16:35
Is this include still needed?
Sami
2016/12/08 16:58:35
Oops, thanks. Removed.
| |
21 | 22 |
22 #if defined(USE_OZONE) | 23 #if defined(USE_OZONE) |
23 #include "ui/ozone/public/ozone_platform.h" | 24 #include "ui/ozone/public/ozone_platform.h" |
24 #endif | 25 #endif |
25 | 26 |
26 namespace aura { | 27 namespace aura { |
27 | 28 |
28 namespace { | 29 namespace { |
29 | 30 |
30 // Env is thread local so that aura may be used on multiple threads. | 31 // Env is thread local so that aura may be used on multiple threads. |
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
207 std::unique_ptr<ui::EventTargetIterator> Env::GetChildIterator() const { | 208 std::unique_ptr<ui::EventTargetIterator> Env::GetChildIterator() const { |
208 return nullptr; | 209 return nullptr; |
209 } | 210 } |
210 | 211 |
211 ui::EventTargeter* Env::GetEventTargeter() { | 212 ui::EventTargeter* Env::GetEventTargeter() { |
212 NOTREACHED(); | 213 NOTREACHED(); |
213 return NULL; | 214 return NULL; |
214 } | 215 } |
215 | 216 |
216 } // namespace aura | 217 } // namespace aura |
OLD | NEW |