| Index: ui/aura/desktop.cc
|
| diff --git a/ui/aura/desktop.cc b/ui/aura/desktop.cc
|
| index 6364836dbe8dc42deec360eb1a6b2aad92526ba0..6af7e40bfd11dee1bfbe5a49cfafe288ace12196 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());
|
| }
|
|
|
| @@ -145,7 +146,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;
|
| }
|
|
|