Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1901)

Issues Search
    My Issues | Starred     Open | Closed | All

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: fix win_aura compile 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell.cc ('k') | ash/tooltips/tooltip_controller_unittest.cc » ('j') | chrome/browser/ui/views/extensions/extension_dialog.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/tooltips/tooltip_controller.cc
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc
index 4798cd33ecf009ab174d5c0bb0e733c1fe2d91ce..f05cae65ad8abb9dbb4d0b44b9df41fd22da1374 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"
@@ -376,7 +376,7 @@ void TooltipController::TooltipTimerFired() {
void TooltipController::UpdateIfRequired() {
if (!tooltips_enabled_ || mouse_pressed_ || IsDragDropInProgress() ||
- !aura::Env::GetInstance()->cursor_manager()->cursor_visible()) {
+ !ash::Shell::GetInstance()->cursor_manager()->cursor_visible()) {
tooltip_->Hide();
return;
}
« no previous file with comments | « ash/shell.cc ('k') | ash/tooltips/tooltip_controller_unittest.cc » ('j') | chrome/browser/ui/views/extensions/extension_dialog.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698