ash/wm/power_button_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/wm/power_button_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/wm/default_window_resizer.cc ('k') | ash/wm/power_button_controller_unittest.cc » ('j') | chrome/browser/ui/views/extensions/extension_dialog.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/power_button_controller.cc

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

index 7f2ceacc694666a40d67aa80ec9c875a15da54b4..73c1a3bbbafbd8155db17c41bbf708ec6b40763b 100644

--- a/ash/wm/power_button_controller.cc

+++ b/ash/wm/power_button_controller.cc

@@ -7,11 +7,11 @@

#include "ash/ash_switches.h"

#include "ash/shell.h"

#include "ash/shell_window_ids.h"

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

#include "base/command_line.h"

#include "base/logging.h"

#include "base/time.h"

#include "third_party/skia/include/core/SkColor.h"

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

#include "ui/aura/env.h"

#include "ui/aura/root_window.h"

#include "ui/aura/shared/compound_event_filter.h"

@@ -311,9 +311,9 @@ void PowerButtonController::OnAppTerminating() {

// can really hope for is that we'll have time to clear the screen.

if (!shutting_down_) {

shutting_down_ = true;

- ash::Shell::GetInstance()->env_filter()->

- set_update_cursor_visibility(false);

- aura::Env::GetInstance()->cursor_manager()->ShowCursor(false);

+ Shell* shell = ash::Shell::GetInstance();

+ shell->env_filter()->set_update_cursor_visibility(false);

+ shell->cursor_manager()->ShowCursor(false);

ShowBackgroundLayer();

StartAnimation(ALL_CONTAINERS, ANIMATION_HIDE);

}

@@ -536,8 +536,9 @@ void PowerButtonController::StartShutdownAnimationAndRequestShutdown() {

DCHECK(!shutting_down_);

shutting_down_ = true;

- ash::Shell::GetInstance()->env_filter()->set_update_cursor_visibility(false);

- aura::Env::GetInstance()->cursor_manager()->ShowCursor(false);

+ Shell* shell = ash::Shell::GetInstance();

+ shell->env_filter()->set_update_cursor_visibility(false);

+ shell->cursor_manager()->ShowCursor(false);

ShowBackgroundLayer();

if (login_status_ != user::LOGGED_IN_NONE) {

« no previous file with comments | « ash/wm/default_window_resizer.cc ('k') | ash/wm/power_button_controller_unittest.cc » ('j') | chrome/browser/ui/views/extensions/extension_dialog.cc » ('J')