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 "ui/aura/env_observer.h" | 8 #include "ui/aura/env_observer.h" |
9 #include "ui/aura/root_window_host.h" | 9 #include "ui/aura/root_window_host.h" |
10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
11 #include "ui/compositor/compositor.h" | 11 #include "ui/compositor/compositor.h" |
12 #include "ui/compositor/compositor_switches.h" | 12 #include "ui/compositor/compositor_switches.h" |
13 | 13 |
14 #if defined(USE_X11) | 14 #if defined(USE_X11) |
15 #include "base/message_pump_aurax11.h" | 15 #include "base/message_pump_aurax11.h" |
16 #endif | 16 #endif |
17 | 17 |
18 namespace aura { | 18 namespace aura { |
19 | 19 |
20 // static | 20 // static |
21 Env* Env::instance_ = NULL; | 21 Env* Env::instance_ = NULL; |
22 | 22 |
23 //////////////////////////////////////////////////////////////////////////////// | 23 //////////////////////////////////////////////////////////////////////////////// |
24 // Env, public: | 24 // Env, public: |
25 | 25 |
26 Env::Env() | 26 Env::Env() |
27 : mouse_button_flags_(0), | 27 : mouse_button_flags_(0), |
28 is_touch_down_(false), | 28 is_touch_down_(false), |
29 render_white_bg_(true) { | 29 render_white_bg_(true), |
| 30 stacking_client_(NULL) { |
30 } | 31 } |
31 | 32 |
32 Env::~Env() { | 33 Env::~Env() { |
33 #if defined(USE_X11) | 34 #if defined(USE_X11) |
34 base::MessagePumpAuraX11::Current()->RemoveObserver( | 35 base::MessagePumpAuraX11::Current()->RemoveObserver( |
35 &device_list_updater_aurax11_); | 36 &device_list_updater_aurax11_); |
36 #endif | 37 #endif |
37 | 38 |
38 ui::Compositor::Terminate(); | 39 ui::Compositor::Terminate(); |
39 } | 40 } |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 | 104 |
104 bool Env::CanAcceptEvent(const ui::Event& event) { | 105 bool Env::CanAcceptEvent(const ui::Event& event) { |
105 return true; | 106 return true; |
106 } | 107 } |
107 | 108 |
108 ui::EventTarget* Env::GetParentTarget() { | 109 ui::EventTarget* Env::GetParentTarget() { |
109 return NULL; | 110 return NULL; |
110 } | 111 } |
111 | 112 |
112 } // namespace aura | 113 } // namespace aura |
OLD | NEW |