| Index: ui/aura/toplevel_window_container.cc
|
| ===================================================================
|
| --- ui/aura/toplevel_window_container.cc (revision 104542)
|
| +++ ui/aura/toplevel_window_container.cc (working copy)
|
| @@ -8,7 +8,6 @@
|
| #include "ui/aura/toplevel_window_event_filter.h"
|
|
|
| namespace aura {
|
| -namespace internal {
|
|
|
| ToplevelWindowContainer::ToplevelWindowContainer()
|
| : Window(NULL) {
|
| @@ -19,9 +18,22 @@
|
| ToplevelWindowContainer::~ToplevelWindowContainer() {
|
| }
|
|
|
| -bool ToplevelWindowContainer::IsToplevelWindowContainer() const {
|
| - return true;
|
| +Window* ToplevelWindowContainer::GetTopmostWindowToActivate(
|
| + Window* ignore) const {
|
| + for (Window::Windows::const_reverse_iterator i = children().rbegin();
|
| + i != children().rend(); ++i) {
|
| + if (*i != ignore && (*i)->CanActivate())
|
| + return *i;
|
| + }
|
| + return NULL;
|
| }
|
|
|
| -} // namespace internal
|
| +ToplevelWindowContainer* ToplevelWindowContainer::AsToplevelWindowContainer() {
|
| + return this;
|
| +}
|
| +
|
| +const ToplevelWindowContainer*
|
| + ToplevelWindowContainer::AsToplevelWindowContainer() const {
|
| + return this;
|
| +}
|
| } // namespace aura
|
|
|