| Index: athena/wm/window_manager_impl.cc
|
| diff --git a/athena/wm/window_manager_impl.cc b/athena/wm/window_manager_impl.cc
|
| index f0020c47bc14f2917b393ef529fa78e96819cb0a..3e6e3904f63c3010949e1e95bfaf866ddf3bb69b 100644
|
| --- a/athena/wm/window_manager_impl.cc
|
| +++ b/athena/wm/window_manager_impl.cc
|
| @@ -150,9 +150,7 @@
|
| WindowManagerImpl::WindowManagerImpl() {
|
| ScreenManager::ContainerParams params("DefaultContainer", CP_DEFAULT);
|
| params.can_activate_children = true;
|
| - params.default_parent = true;
|
| - params.modal_container_priority = CP_SYSTEM_MODAL;
|
| - container_.reset(ScreenManager::Get()->CreateContainer(params));
|
| + container_.reset(ScreenManager::Get()->CreateDefaultContainer(params));
|
| container_->SetLayoutManager(new AthenaContainerLayoutManager);
|
| container_->AddObserver(this);
|
| window_list_provider_.reset(new WindowListProviderImpl(container_.get()));
|
| @@ -166,8 +164,6 @@
|
| wm_state_.reset(new wm::WMState());
|
| aura::client::ActivationClient* activation_client =
|
| aura::client::GetActivationClient(container_->GetRootWindow());
|
| - DCHECK(container_->GetRootWindow());
|
| - DCHECK(activation_client);
|
| shadow_controller_.reset(new wm::ShadowController(activation_client));
|
| instance = this;
|
| InstallAccelerators();
|
|
|