Use a single ToplevelWindowEventHandler for the ash::Shell

ash/wm/workspace_controller.cc

 // Copyright (c) 2012 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 "ash/wm/workspace_controller.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 27 matching lines @@
           !wm::GetWindowState(window)->IsMinimized() &&
           window->type() != aura::client::WINDOW_TYPE_POPUP &&
           !window->transient_parent());
 }
 
 }  // namespace
 
 WorkspaceController::WorkspaceController(aura::Window* viewport)
     : viewport_(viewport),
       shelf_(NULL),
-      event_handler_(new WorkspaceEventHandler(viewport_)) {
+      event_handler_(new WorkspaceEventHandler),
+      layout_manager_(new WorkspaceLayoutManager(viewport)) {
   SetWindowVisibilityAnimationTransition(
       viewport_, views::corewm::ANIMATE_NONE);
 
-  // The layout-manager cannot be created in the initializer list since it
-  // depends on the window to have been initialized.
-  layout_manager_ = new WorkspaceLayoutManager(viewport_);
   viewport_->SetLayoutManager(layout_manager_);
-
-  viewport_->Show();
+  viewport_->AddPreTargetHandler(event_handler_.get());
+  viewport_->AddPostTargetHandler(event_handler_.get());
 }
 
 WorkspaceController::~WorkspaceController() {
   viewport_->SetLayoutManager(NULL);
-  viewport_->SetEventFilter(NULL);
   viewport_->RemovePreTargetHandler(event_handler_.get());
   viewport_->RemovePostTargetHandler(event_handler_.get());
 }
 
 WorkspaceWindowState WorkspaceController::GetWindowState() const {
   if (!shelf_)
     return WORKSPACE_WINDOW_STATE_DEFAULT;
   const aura::Window* topmost_fullscreen_window = GetRootWindowController(
       viewport_->GetRootWindow())->GetWindowForFullscreenMode();
   if (topmost_fullscreen_window &&
@@ skipping 67 matching lines @@
     settings.SetTweenType(gfx::Tween::EASE_OUT);
     settings.SetTransitionDuration(
         base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS));
     viewport_->layer()->SetTransform(gfx::Transform());
     viewport_->layer()->SetOpacity(1.0f);
   }
 }
 
 }  // namespace internal
 }  // namespace ash