| 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/message_loop/message_pump_dispatcher.h" | 8 #include "base/message_loop/message_pump_dispatcher.h" |
| 9 #include "ui/aura/env_observer.h" | 9 #include "ui/aura/env_observer.h" |
| 10 #include "ui/aura/input_state_lookup.h" | 10 #include "ui/aura/input_state_lookup.h" |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 | 86 |
| 87 void Env::RootWindowActivated(RootWindow* root_window) { | 87 void Env::RootWindowActivated(RootWindow* root_window) { |
| 88 FOR_EACH_OBSERVER(EnvObserver, observers_, | 88 FOR_EACH_OBSERVER(EnvObserver, observers_, |
| 89 OnRootWindowActivated(root_window)); | 89 OnRootWindowActivated(root_window)); |
| 90 } | 90 } |
| 91 | 91 |
| 92 //////////////////////////////////////////////////////////////////////////////// | 92 //////////////////////////////////////////////////////////////////////////////// |
| 93 // Env, private: | 93 // Env, private: |
| 94 | 94 |
| 95 void Env::Init() { | 95 void Env::Init() { |
| 96 #if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(USE_X11) && \ | 96 #if defined(OS_WIN) |
| 97 !defined(USE_OZONE) | |
| 98 dispatcher_.reset(CreateDispatcher()); | 97 dispatcher_.reset(CreateDispatcher()); |
| 99 #endif | 98 #endif |
| 100 #if defined(USE_X11) | 99 #if defined(USE_X11) |
| 101 // We can't do this with a root window listener because XI_HierarchyChanged | 100 // We can't do this with a root window listener because XI_HierarchyChanged |
| 102 // messages don't have a target window. | 101 // messages don't have a target window. |
| 103 base::MessagePumpX11::Current()->AddObserver( | 102 base::MessagePumpX11::Current()->AddObserver( |
| 104 &device_list_updater_aurax11_); | 103 &device_list_updater_aurax11_); |
| 105 #endif | 104 #endif |
| 106 ui::Compositor::Initialize(); | 105 ui::Compositor::Initialize(); |
| 107 } | 106 } |
| (...skipping 22 matching lines...) Expand all Loading... |
| 130 scoped_ptr<ui::EventTargetIterator> Env::GetChildIterator() const { | 129 scoped_ptr<ui::EventTargetIterator> Env::GetChildIterator() const { |
| 131 return scoped_ptr<ui::EventTargetIterator>(); | 130 return scoped_ptr<ui::EventTargetIterator>(); |
| 132 } | 131 } |
| 133 | 132 |
| 134 ui::EventTargeter* Env::GetEventTargeter() { | 133 ui::EventTargeter* Env::GetEventTargeter() { |
| 135 NOTREACHED(); | 134 NOTREACHED(); |
| 136 return NULL; | 135 return NULL; |
| 137 } | 136 } |
| 138 | 137 |
| 139 } // namespace aura | 138 } // namespace aura |
| OLD | NEW |