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

Unified Diff: ash/wm/window_manager_unittest.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 | « ash/wm/system_modal_container_layout_manager.cc ('k') | ash/wm/workspace/multi_window_resize_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_manager_unittest.cc
===================================================================
--- ash/wm/window_manager_unittest.cc (revision 167200)
+++ ash/wm/window_manager_unittest.cc (working copy)
@@ -14,8 +14,6 @@
#include "ui/aura/env.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/aura/test/aura_test_base.h"
#include "ui/aura/test/event_generator.h"
#include "ui/aura/test/test_event_filter.h"
@@ -25,6 +23,8 @@
#include "ui/base/events/event.h"
#include "ui/base/hit_test.h"
#include "ui/gfx/screen.h"
+#include "ui/views/corewm/compound_event_filter.h"
+#include "ui/views/corewm/input_method_event_filter.h"
namespace {
@@ -525,7 +525,7 @@
scoped_ptr<aura::test::TestEventFilter> f2(new aura::test::TestEventFilter);
// Adds them to root window event filter.
- aura::shared::CompoundEventFilter* env_filter =
+ views::corewm::CompoundEventFilter* env_filter =
Shell::GetInstance()->env_filter();
env_filter->AddFilter(f1.get());
env_filter->AddFilter(f2.get());
« no previous file with comments | « ash/wm/system_modal_container_layout_manager.cc ('k') | ash/wm/workspace/multi_window_resize_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698