Handle transient children as a part of transient parent

athena/wm/window_manager_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/wm/window_manager_impl.h"
 
 #include <algorithm>
 
 #include "athena/screen/public/screen_manager.h"
 #include "athena/util/container_priorities.h"
 #include "athena/wm/bezel_controller.h"
 #include "athena/wm/public/window_manager_observer.h"
 #include "athena/wm/split_view_controller.h"
 #include "athena/wm/title_drag_controller.h"
 #include "athena/wm/window_list_provider_impl.h"
 #include "athena/wm/window_overview_mode.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/closure_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/wm/core/shadow_controller.h"
+#include "ui/wm/core/transient_window_manager.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/core/wm_state.h"
 #include "ui/wm/public/activation_client.h"
 #include "ui/wm/public/window_types.h"
 
 namespace athena {
 namespace {
 class WindowManagerImpl* instance = NULL;
 
 void SetWindowState(aura::Window* window,
@@ skipping 56 matching lines @@
             gfx::Rect(gfx::Point(split_size.width(), 0), split_size));
       else
         window->SetBounds(gfx::Rect(work_area));
     } else {
       window->SetBounds(gfx::Rect(work_area));
     }
   }
 }
 
 void AthenaContainerLayoutManager::OnWindowAddedToLayout(aura::Window* child) {
-  if (!instance->window_list_provider_->IsWindowInList(child))
+  // TODO(oshima): Split view modes needs to take the transient window into
+  // account.
+  if (wm::GetTransientParent(child)) {
+    wm::TransientWindowManager::Get(child)
+        ->set_parent_controls_visibility(true);
+  }
+
+  if (!instance->window_list_provider_->IsValidWindow(child))
     return;
 
   if (instance->split_view_controller_->IsSplitViewModeActive() &&
       !instance->IsOverviewModeActive()) {
     instance->split_view_controller_->ReplaceWindow(
         instance->split_view_controller_->left_window(), child);
   } else {
     gfx::Size size =
         gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().work_area().size();
     child->SetBounds(gfx::Rect(size));
@@ skipping 120 matching lines @@
         container_.get(), window_list_provider_.get(),
         split_view_controller_.get(), this);
   } else {
     overview_.reset();
     FOR_EACH_OBSERVER(WindowManagerObserver, observers_, OnOverviewModeExit());
   }
 }
 
 void WindowManagerImpl::InstallAccelerators() {
   const AcceleratorData accelerator_data[] = {
-      {TRIGGER_ON_PRESS, ui::VKEY_F6, ui::EF_NONE, CMD_TOGGLE_OVERVIEW,
+      {TRIGGER_ON_PRESS,
+       ui::VKEY_F6,
+       ui::EF_NONE,
+       CMD_TOGGLE_OVERVIEW,
        AF_NONE},
-      {TRIGGER_ON_PRESS, ui::VKEY_F6, ui::EF_CONTROL_DOWN,
-       CMD_TOGGLE_SPLIT_VIEW, AF_NONE},
+      {TRIGGER_ON_PRESS,
+       ui::VKEY_F6,
+       ui::EF_CONTROL_DOWN,
+       CMD_TOGGLE_SPLIT_VIEW,
+       AF_NONE},
+      // Debug
+      {TRIGGER_ON_PRESS,
+       ui::VKEY_6,
+       ui::EF_NONE,
+       CMD_TOGGLE_OVERVIEW,
+       AF_NONE | AF_DEBUG},
   };
   AcceleratorManager::Get()->RegisterAccelerators(
       accelerator_data, arraysize(accelerator_data), this);
 }
 
 void WindowManagerImpl::AddObserver(WindowManagerObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void WindowManagerImpl::RemoveObserver(WindowManagerObserver* observer) {
@@ skipping 168 matching lines @@
   DCHECK(!instance);
 }
 
 // static
 WindowManager* WindowManager::Get() {
   DCHECK(instance);
   return instance;
 }
 
 }  // namespace athena