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

Unified Diff: ash/wm/workspace/multi_window_resize_controller.cc

Issue 10332145: aura/ash split: Moves RootWindowEventFilter and InputMethodEventFilter to ui/aura/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved to ui/aura/shared/ Created 8 years, 7 months 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
Index: ash/wm/workspace/multi_window_resize_controller.cc
diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc
index cde8b66dd1545e5bd860263b6d0e80e92f06025a..59f8eca7f01407864aebd4d5967a3b2e583e53e4 100644
--- a/ash/wm/workspace/multi_window_resize_controller.cc
+++ b/ash/wm/workspace/multi_window_resize_controller.cc
@@ -6,13 +6,13 @@
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
-#include "ash/wm/root_window_event_filter.h"
#include "ash/wm/window_animations.h"
#include "ash/wm/workspace/workspace_event_filter.h"
#include "ash/wm/workspace/workspace_window_resizer.h"
#include "grit/ui_resources.h"
#include "ui/aura/event_filter.h"
#include "ui/aura/root_window.h"
+#include "ui/aura/shared/root_window_event_filter.h"
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
#include "ui/base/hit_test.h"
@@ -98,7 +98,8 @@ class MultiWindowResizeController::ResizeView : public views::View {
virtual gfx::NativeCursor GetCursor(
const views::MouseEvent& event) OVERRIDE {
int component = (direction_ == LEFT_RIGHT) ? HTRIGHT : HTBOTTOM;
- return RootWindowEventFilter::CursorForWindowComponent(component);
+ return aura::shared::RootWindowEventFilter::CursorForWindowComponent(
+ component);
}
private:

Powered by Google App Engine
This is Rietveld 408576698