ash/wm/power_button_controller_unittest.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/power_button_controller_unittest.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/power_button_controller_unittest.cc

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

index 14f02326f3a15e653dd19e7d6e7333003b84cd9b..b84a0717c6ddd56a4854332de9f6a2291b03334b 100644

--- a/ash/wm/power_button_controller_unittest.cc

+++ b/ash/wm/power_button_controller_unittest.cc

@@ -6,9 +6,9 @@

#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

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

#include "base/memory/scoped_ptr.h"

#include "base/time.h"

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

#include "ui/aura/env.h"

#include "ui/aura/root_window.h"

#include "ui/gfx/rect.h"

@@ -18,7 +18,7 @@ namespace ash {

namespace test {

namespace {

bool cursor_visible() {

- return aura::Env::GetInstance()->cursor_manager()->cursor_visible();

+ return ash::Shell::GetInstance()->cursor_manager()->cursor_visible();

}

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