| Index: ash/first_run/desktop_cleaner.cc
|
| diff --git a/ash/first_run/desktop_cleaner.cc b/ash/first_run/desktop_cleaner.cc
|
| index 83cc5732522d6adad434541d82e8d8ebd67a63a0..42b92a3ef7a9758f43d5210c0d081b7e90d0aa0b 100644
|
| --- a/ash/first_run/desktop_cleaner.cc
|
| +++ b/ash/first_run/desktop_cleaner.cc
|
| @@ -17,12 +17,11 @@ namespace ash {
|
| namespace {
|
|
|
| const int kContainerIdsToHide[] = {
|
| - kShellWindowId_DefaultContainer,
|
| - kShellWindowId_AlwaysOnTopContainer,
|
| - kShellWindowId_PanelContainer,
|
| - // TODO(dzhioev): uncomment this when issue with BrowserView::CanActivate
|
| - // will be fixed.
|
| - // kShellWindowId_SystemModalContainer
|
| + kShellWindowId_DefaultContainer, kShellWindowId_AlwaysOnTopContainer,
|
| + kShellWindowId_PanelContainer,
|
| + // TODO(dzhioev): uncomment this when issue with BrowserView::CanActivate
|
| + // will be fixed.
|
| + // kShellWindowId_SystemModalContainer
|
| };
|
|
|
| } // namespace
|
| @@ -31,8 +30,7 @@ class ContainerHider : public aura::WindowObserver,
|
| public ui::ImplicitAnimationObserver {
|
| public:
|
| explicit ContainerHider(aura::Window* container)
|
| - : container_was_hidden_(!container->IsVisible()),
|
| - container_(container) {
|
| + : container_was_hidden_(!container->IsVisible()), container_(container) {
|
| if (container_was_hidden_)
|
| return;
|
| ui::Layer* layer = container_->layer();
|
| @@ -111,4 +109,3 @@ std::vector<int> DesktopCleaner::GetContainersToHideForTest() {
|
| }
|
|
|
| } // namespace ash
|
| -
|
|
|