| Index: ui/views/widget/desktop_root_window_host_linux.cc
|
| ===================================================================
|
| --- ui/views/widget/desktop_root_window_host_linux.cc (revision 167200)
|
| +++ ui/views/widget/desktop_root_window_host_linux.cc (working copy)
|
| @@ -19,8 +19,8 @@
|
| #include "ui/aura/desktop/desktop_dispatcher_client.h"
|
| #include "ui/aura/focus_manager.h"
|
| #include "ui/aura/root_window.h"
|
| -#include "ui/aura/shared/compound_event_filter.h"
|
| -#include "ui/aura/shared/input_method_event_filter.h"
|
| +#include "ui/views/corewm/compound_event_filter.h"
|
| +#include "ui/views/corewm/input_method_event_filter.h"
|
| #include "ui/aura/window_property.h"
|
| #include "ui/base/events/event_utils.h"
|
| #include "ui/base/native_theme/native_theme.h"
|
| @@ -235,11 +235,11 @@
|
| position_client_.get());
|
|
|
| // No event filter for aura::Env. Create CompoundEvnetFilter per RootWindow.
|
| - root_window_event_filter_ = new aura::shared::CompoundEventFilter;
|
| + root_window_event_filter_ = new views::corewm::CompoundEventFilter;
|
| // Pass ownership of the filter to the root_window.
|
| root_window_->SetEventFilter(root_window_event_filter_);
|
|
|
| - input_method_filter_.reset(new aura::shared::InputMethodEventFilter());
|
| + input_method_filter_.reset(new views::corewm::InputMethodEventFilter);
|
| input_method_filter_->SetInputMethodPropertyInRootWindow(root_window_);
|
| root_window_event_filter_->AddFilter(input_method_filter_.get());
|
|
|
|
|