| Index: ash/wm/ash_native_cursor_manager.cc
|
| diff --git a/ash/wm/ash_native_cursor_manager.cc b/ash/wm/ash_native_cursor_manager.cc
|
| index 9983620a3fd0cd9fc6370305c90e9e6ef838c62c..3ab68949ae54694ca3cf05bd71fc85bbc27998b2 100644
|
| --- a/ash/wm/ash_native_cursor_manager.cc
|
| +++ b/ash/wm/ash_native_cursor_manager.cc
|
| @@ -16,7 +16,7 @@
|
| #include "ui/base/layout.h"
|
|
|
| namespace ash {
|
| -namespace {
|
| +namespace {
|
|
|
| void SetCursorOnAllRootWindows(gfx::NativeCursor cursor) {
|
| aura::Window::Windows root_windows =
|
| @@ -58,19 +58,14 @@ void NotifyMouseEventsEnableStateChange(bool enabled) {
|
| } // namespace
|
|
|
| AshNativeCursorManager::AshNativeCursorManager()
|
| - : native_cursor_enabled_(true),
|
| - image_cursors_(new ui::ImageCursors) {
|
| -}
|
| -
|
| -AshNativeCursorManager::~AshNativeCursorManager() {
|
| -}
|
| + : native_cursor_enabled_(true), image_cursors_(new ui::ImageCursors) {}
|
|
|
| +AshNativeCursorManager::~AshNativeCursorManager() {}
|
|
|
| void AshNativeCursorManager::SetNativeCursorEnabled(bool enabled) {
|
| native_cursor_enabled_ = enabled;
|
|
|
| - ::wm::CursorManager* cursor_manager =
|
| - Shell::GetInstance()->cursor_manager();
|
| + ::wm::CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
|
| SetCursor(cursor_manager->GetCursor(), cursor_manager);
|
| }
|
|
|
| @@ -80,12 +75,14 @@ void AshNativeCursorManager::SetDisplay(
|
| DCHECK(display.is_valid());
|
| // Use the platform's device scale factor instead of the display's, which
|
| // might have been adjusted for the UI scale.
|
| - const float original_scale = Shell::GetInstance()->display_manager()->
|
| - GetDisplayInfo(display.id()).device_scale_factor();
|
| + const float original_scale = Shell::GetInstance()
|
| + ->display_manager()
|
| + ->GetDisplayInfo(display.id())
|
| + .device_scale_factor();
|
| #if defined(OS_CHROMEOS)
|
| // And use the nearest resource scale factor.
|
| - const float cursor_scale = ui::GetScaleForScaleFactor(
|
| - ui::GetSupportedScaleFactor(original_scale));
|
| + const float cursor_scale =
|
| + ui::GetScaleForScaleFactor(ui::GetSupportedScaleFactor(original_scale));
|
| #else
|
| // TODO(oshima): crbug.com/143619
|
| const float cursor_scale = original_scale;
|
|
|