| Index: ui/aura/desktop.cc
|
| diff --git a/ui/aura/desktop.cc b/ui/aura/desktop.cc
|
| index 43d76ba1049e61ada88b294c6a090d1dae49c3af..a38d05b4815074f0c83f32475e16b5a094d1e745 100644
|
| --- a/ui/aura/desktop.cc
|
| +++ b/ui/aura/desktop.cc
|
| @@ -50,6 +50,7 @@ Desktop::~Desktop() {
|
|
|
| void Desktop::Init() {
|
| window_->Init();
|
| + window_->Show();
|
| compositor()->SetRootLayer(window_->layer());
|
| }
|
|
|
| @@ -136,7 +137,7 @@ Window* Desktop::GetTopmostWindowToActivate(Window* ignore) {
|
| Window::Windows windows(default_parent_->children());
|
| for (Window::Windows::const_reverse_iterator i = windows.rbegin();
|
| i != windows.rend(); ++i) {
|
| - if (*i != ignore && (*i)->visible() &&
|
| + if (*i != ignore && (*i)->IsVisible() &&
|
| (*i)->delegate()->ShouldActivate(NULL))
|
| return *i;
|
| }
|
|
|