ash/tooltips/tooltip_controller.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/tooltips/tooltip_controller.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/tooltips/tooltip_controller.cc

diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc

index 937ebc7a75008745362b71dc9d4f2a1af7709e8b..470427101ddd3683fe70f9efa8095986cdd03b55 100644

--- a/ash/tooltips/tooltip_controller.cc

+++ b/ash/tooltips/tooltip_controller.cc

@@ -8,12 +8,12 @@

#include "ash/ash_switches.h"

#include "ash/shell.h"

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

#include "base/command_line.h"

#include "base/location.h"

#include "base/string_split.h"

#include "base/time.h"

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

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

#include "ui/aura/env.h"

#include "ui/aura/event.h"

#include "ui/aura/root_window.h"

@@ -403,7 +403,7 @@ void TooltipController::TooltipShownTimerFired() {

void TooltipController::UpdateIfRequired() {

if (!tooltips_enabled_ || mouse_pressed_ || IsDragDropInProgress() ||

- !aura::Env::GetInstance()->cursor_manager()->cursor_visible()) {

+ !ash::Shell::GetInstance()->cursor_manager()->cursor_visible()) {

GetTooltip()->Hide();

return;

}

« no previous file with comments | « ash/shell.cc ('k') | ash/tooltips/tooltip_controller_unittest.cc » ('j') | no next file with comments »