| 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" |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 | 57 |
| 58 void Env::AddObserver(EnvObserver* observer) { | 58 void Env::AddObserver(EnvObserver* observer) { |
| 59 observers_.AddObserver(observer); | 59 observers_.AddObserver(observer); |
| 60 } | 60 } |
| 61 | 61 |
| 62 void Env::RemoveObserver(EnvObserver* observer) { | 62 void Env::RemoveObserver(EnvObserver* observer) { |
| 63 observers_.RemoveObserver(observer); | 63 observers_.RemoveObserver(observer); |
| 64 } | 64 } |
| 65 | 65 |
| 66 #if !defined(OS_MACOSX) | 66 #if !defined(OS_MACOSX) |
| 67 MessageLoop::Dispatcher* Env::GetDispatcher() { | 67 base::MessageLoop::Dispatcher* Env::GetDispatcher() { |
| 68 #if defined(USE_X11) | 68 #if defined(USE_X11) |
| 69 return base::MessagePumpAuraX11::Current(); | 69 return base::MessagePumpAuraX11::Current(); |
| 70 #else | 70 #else |
| 71 return dispatcher_.get(); | 71 return dispatcher_.get(); |
| 72 #endif | 72 #endif |
| 73 } | 73 } |
| 74 #endif | 74 #endif |
| 75 | 75 |
| 76 void Env::RootWindowActivated(RootWindow* root_window) { | 76 void Env::RootWindowActivated(RootWindow* root_window) { |
| 77 FOR_EACH_OBSERVER(EnvObserver, observers_, | 77 FOR_EACH_OBSERVER(EnvObserver, observers_, |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 | 109 |
| 110 bool Env::CanAcceptEvent(const ui::Event& event) { | 110 bool Env::CanAcceptEvent(const ui::Event& event) { |
| 111 return true; | 111 return true; |
| 112 } | 112 } |
| 113 | 113 |
| 114 ui::EventTarget* Env::GetParentTarget() { | 114 ui::EventTarget* Env::GetParentTarget() { |
| 115 return NULL; | 115 return NULL; |
| 116 } | 116 } |
| 117 | 117 |
| 118 } // namespace aura | 118 } // namespace aura |
| OLD | NEW |