diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 04:42:59 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 04:42:59 +0000 |
| commit | bf9e91846cf57ce4a921b7901fd840c4f804e828 (patch) | |
| tree | 7cc7e21e25bf801f164416833fb8e469b492775c /ash/drag_drop/drag_drop_tracker.cc | |
| parent | 6c6862b8c22e1adc3fed74f5621e78ea09eea76c (diff) | |
| download | chromium_src-bf9e91846cf57ce4a921b7901fd840c4f804e828.zip chromium_src-bf9e91846cf57ce4a921b7901fd840c4f804e828.tar.gz chromium_src-bf9e91846cf57ce4a921b7901fd840c4f804e828.tar.bz2 | |
Make aura::clients take Window instead of RootWindow
In preparation for hiding/changing RootWindow more...
R=sky@chromium.org
http://crbug.com/308843
Review URL: https://codereview.chromium.org/38423002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230641 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop/drag_drop_tracker.cc')
| -rw-r--r-- | ash/drag_drop/drag_drop_tracker.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/drag_drop/drag_drop_tracker.cc b/ash/drag_drop/drag_drop_tracker.cc index f18e0e8..72f0389 100644 --- a/ash/drag_drop/drag_drop_tracker.cc +++ b/ash/drag_drop/drag_drop_tracker.cc @@ -9,6 +9,7 @@ #include "ash/wm/coordinate_conversion.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/root_window.h" +#include "ui/aura/window.h" #include "ui/events/event.h" #include "ui/gfx/screen.h" @@ -18,7 +19,7 @@ namespace internal { namespace { // Creates a window for capturing drag events. -aura::Window* CreateCaptureWindow(aura::RootWindow* context_root, +aura::Window* CreateCaptureWindow(aura::Window* context_root, aura::WindowDelegate* delegate) { aura::Window* window = new aura::Window(delegate); window->SetType(aura::client::WINDOW_TYPE_NORMAL); @@ -31,7 +32,7 @@ aura::Window* CreateCaptureWindow(aura::RootWindow* context_root, } // namespace -DragDropTracker::DragDropTracker(aura::RootWindow* context_root, +DragDropTracker::DragDropTracker(aura::Window* context_root, aura::WindowDelegate* delegate) : capture_window_(CreateCaptureWindow(context_root, delegate)) { } |