Change the way the ToplevelEventHandler is hooked up. It is now both a pre- and post-target event h…

ash/wm/workspace/workspace2.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/workspace2.h"
 
 #include "ash/shell_window_ids.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
@@ skipping 13 matching lines @@
       event_handler_(new WorkspaceEventHandler(window_)) {
   window_->SetProperty(internal::kChildWindowVisibilityChangesAnimatedKey,
                        true);
   window_->set_id(kShellWindowId_WorkspaceContainer);
   window_->SetName("WorkspaceContainer");
   window_->Init(ui::LAYER_NOT_DRAWN);
   // Do this so when animating out windows don't extend beyond the bounds.
   window_->layer()->SetMasksToBounds(true);
   window_->Hide();
   window_->SetParent(parent);
-  window_->AddPreTargetHandler(event_handler_.get());
   window_->SetProperty(internal::kUsesScreenCoordinatesKey, true);
 }
 
 Workspace2::~Workspace2() {
   // ReleaseWindow() should have been invoked before we're deleted.
   DCHECK(!window_);
 }
 
 aura::Window* Workspace2::ReleaseWindow() {
   // Remove the LayoutManager and EventFilter as they refer back to us and/or
@@ skipping 31 matching lines @@
         WorkspaceManager2::WillRestoreMaximized(child)) {
       if (++count == 2)
         return count;
     }
   }
   return count;
 }
 
 }  // namespace internal
 }  // namespace ash