Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(385)

Unified Diff: ui/views/widget/desktop_root_window_host_win.cc

Issue 11275139: Move ui\aura\shared to ui\views\corewm (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/widget/desktop_root_window_host_win.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_root_window_host_win.cc
===================================================================
--- ui/views/widget/desktop_root_window_host_win.cc (revision 167200)
+++ ui/views/widget/desktop_root_window_host_win.cc (working copy)
@@ -13,8 +13,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/cursor/cursor_loader_win.h"
#include "ui/base/native_theme/native_theme_aura.h"
@@ -133,10 +133,10 @@
// CEF sets focus to the window the user clicks down on.
// TODO(beng): see if we can't do this some other way. CEF seems a heavy-
// handed way of accomplishing focus.
- root_window_event_filter_ = new aura::shared::CompoundEventFilter;
+ root_window_event_filter_ = new views::corewm::CompoundEventFilter;
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());
« no previous file with comments | « ui/views/widget/desktop_root_window_host_win.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698