aura: Start converting event-filters into event-handlers.

ash/wm/system_modal_container_layout_manager.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/system_modal_container_layout_manager.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/system_modal_container_event_filter.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_util.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/root_window.h"
+#include "ui/aura/shared/compound_event_filter.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
@@ skipping 165 matching lines @@
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
     params.parent = container_;
     params.bounds = gfx::Rect(0, 0, container_->bounds().width(),
         container_->bounds().height());
     modal_screen_->Init(params);
     modal_screen_->GetNativeView()->SetName(
         "SystemModalContainerLayoutManager.ModalScreen");
     modal_screen_->SetContentsView(new ScreenView);
     modal_screen_->GetNativeView()->layer()->SetOpacity(0.0f);
 
-    Shell::GetInstance()->AddEnvEventFilter(modality_filter_.get());
+    Shell::GetInstance()->env_filter()->AddFilter(modality_filter_.get());
   }
 
   ui::ScopedLayerAnimationSettings settings(
       modal_screen_->GetNativeView()->layer()->GetAnimator());
   modal_screen_->Show();
   modal_screen_->GetNativeView()->layer()->SetOpacity(0.5f);
   container_->StackChildAtTop(modal_screen_->GetNativeView());
 }
 
 void SystemModalContainerLayoutManager::DestroyModalScreen() {
-  Shell::GetInstance()->RemoveEnvEventFilter(modality_filter_.get());
+  Shell::GetInstance()->env_filter()->RemoveFilter(modality_filter_.get());
   // modal_screen_ can be NULL when a root window is shutting down
   // and OnWindowDestroying is called first.
   if (modal_screen_) {
     ui::ScopedLayerAnimationSettings settings(
         modal_screen_->GetNativeView()->layer()->GetAnimator());
     modal_screen_->Close();
     settings.AddObserver(
         CreateHidingWindowAnimationObserver(modal_screen_->GetNativeView()));
     modal_screen_->GetNativeView()->layer()->SetOpacity(0.0f);
     modal_screen_ = NULL;
   }
 }
 
 }  // namespace internal
 }  // namespace ash