ash/wm/default_window_resizer.cc - Issue 10692170: Aura desktop: Show resize cursors again.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/default_window_resizer.cc

Issue 10692170: Aura desktop: Show resize cursors again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to ToT Created 8 years, 5 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:

Index: ash/wm/default_window_resizer.cc

diff --git a/ash/wm/default_window_resizer.cc b/ash/wm/default_window_resizer.cc

index 8b5711530b04592d9fe7551021af72602f31eadb..4368c73b88ba14b3230441fe40d1b8a83ebc0d22 100644

--- a/ash/wm/default_window_resizer.cc

+++ b/ash/wm/default_window_resizer.cc

@@ -5,8 +5,8 @@

#include "ash/wm/default_window_resizer.h"

#include "ash/shell.h"

+#include "ash/wm/cursor_manager.h"

#include "ui/aura/client/aura_constants.h"

-#include "ui/aura/cursor_manager.h"

#include "ui/aura/env.h"

#include "ui/aura/root_window.h"

#include "ui/aura/window.h"

@@ -20,7 +20,7 @@

namespace ash {

DefaultWindowResizer::~DefaultWindowResizer() {

- aura::Env::GetInstance()->cursor_manager()->UnlockCursor();

+ ash::Shell::GetInstance()->cursor_manager()->UnlockCursor();

}

// static

@@ -76,7 +76,7 @@ DefaultWindowResizer::DefaultWindowResizer(const Details& details)

: details_(details),

did_move_or_resize_(false) {

DCHECK(details_.is_resizable);

- aura::Env::GetInstance()->cursor_manager()->LockCursor();

+ ash::Shell::GetInstance()->cursor_manager()->LockCursor();

}

} // namespace aura

« no previous file with comments | « ash/wm/cursor_manager.cc ('k') | ash/wm/power_button_controller.cc » ('j') | no next file with comments »