diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 00:41:50 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 00:41:50 +0000 |
| commit | 42713f747e45ec2d4d754f449ba8a0edf5deffe6 (patch) | |
| tree | a278abbd3cf1496c36793168ab27a0d43eb6cd55 /ash/drag_drop/drag_drop_controller.cc | |
| parent | 07f1c36a10e6a5dffb01ea324bc8ca8d11b9653f (diff) | |
| download | chromium_src-42713f747e45ec2d4d754f449ba8a0edf5deffe6.zip chromium_src-42713f747e45ec2d4d754f449ba8a0edf5deffe6.tar.gz chromium_src-42713f747e45ec2d4d754f449ba8a0edf5deffe6.tar.bz2 | |
Rename GetRootWindow() -> GetPrimaryRootWindow()
BUG=123160
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10442017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138950 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop/drag_drop_controller.cc')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 46d1a55..3e4c270 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc @@ -42,7 +42,7 @@ DragDropController::DragDropController() drag_drop_in_progress_(false), should_block_during_drag_drop_(true) { Shell::GetInstance()->AddRootWindowEventFilter(this); - aura::client::SetDragDropClient(Shell::GetRootWindow(), this); + aura::client::SetDragDropClient(Shell::GetPrimaryRootWindow(), this); } DragDropController::~DragDropController() { @@ -56,9 +56,10 @@ int DragDropController::StartDragAndDrop(const ui::OSExchangeData& data, const gfx::Point& root_location, int operation) { DCHECK(!drag_drop_in_progress_); - aura::Window* capture_window = Shell::GetRootWindow()->capture_window(); + aura::Window* capture_window = + Shell::GetPrimaryRootWindow()->capture_window(); if (capture_window) - Shell::GetRootWindow()->ReleaseCapture(capture_window); + Shell::GetPrimaryRootWindow()->ReleaseCapture(capture_window); drag_drop_in_progress_ = true; drag_data_ = &data; @@ -117,7 +118,7 @@ void DragDropController::DragUpdate(aura::Window* target, int op = delegate->OnDragUpdated(e); gfx::NativeCursor cursor = (op == ui::DragDropTypes::DRAG_NONE)? ui::kCursorNoDrop : ui::kCursorCopy; - Shell::GetRootWindow()->SetCursor(cursor); + Shell::GetPrimaryRootWindow()->SetCursor(cursor); } } @@ -130,7 +131,7 @@ void DragDropController::DragUpdate(aura::Window* target, void DragDropController::Drop(aura::Window* target, const aura::LocatedEvent& event) { - Shell::GetRootWindow()->SetCursor(ui::kCursorPointer); + Shell::GetPrimaryRootWindow()->SetCursor(ui::kCursorPointer); aura::client::DragDropDelegate* delegate = NULL; // We must guarantee that a target gets a OnDragEntered before Drop. WebKit @@ -159,7 +160,7 @@ void DragDropController::Drop(aura::Window* target, } void DragDropController::DragCancel() { - Shell::GetRootWindow()->SetCursor(ui::kCursorPointer); + Shell::GetPrimaryRootWindow()->SetCursor(ui::kCursorPointer); // |drag_window_| can be NULL if we have just started the drag and have not // received any DragUpdates, or, if the |drag_window_| gets destroyed during |