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

Unified Diff: chrome/browser/ui/ash/tabs/dock_info_ash.cc

Issue 10835047: Allow the cursor to warp even when a window is dragged (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't check mouse lock status in display controller Created 8 years, 4 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: chrome/browser/ui/ash/tabs/dock_info_ash.cc
diff --git a/chrome/browser/ui/ash/tabs/dock_info_ash.cc b/chrome/browser/ui/ash/tabs/dock_info_ash.cc
index 13bb0a0efbd690d54593942d28f390f3c3fef6f0..4f1b6496c898309da2db3ce6323d21da8f2a266f 100644
--- a/chrome/browser/ui/ash/tabs/dock_info_ash.cc
+++ b/chrome/browser/ui/ash/tabs/dock_info_ash.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/tabs/dock_info.h"
-#include "ash/shell.h"
+#include "ash/wm/coordinate_conversion.h"
#include "ui/aura/client/screen_position_client.h"
#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
@@ -56,7 +56,7 @@ gfx::NativeView DockInfo::GetLocalProcessWindowAtPoint(
const gfx::Point& screen_point,
const std::set<gfx::NativeView>& ignore) {
return GetLocalProcessWindowAtPointImpl(
- screen_point, ignore, ash::Shell::GetRootWindowAt(screen_point));
+ screen_point, ignore, ash::wm::GetRootWindowAt(screen_point));
}
bool DockInfo::GetWindowBounds(gfx::Rect* bounds) const {
« ash/wm/workspace/workspace_window_resizer.cc ('K') | « ash/wm/workspace/workspace_window_resizer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698