| Index: ash/wm/classic_ash_native_cursor_manager.h
|
| diff --git a/ash/wm/ash_native_cursor_manager.h b/ash/wm/classic_ash_native_cursor_manager.h
|
| similarity index 58%
|
| copy from ash/wm/ash_native_cursor_manager.h
|
| copy to ash/wm/classic_ash_native_cursor_manager.h
|
| index fac694dd960fa93e45f9c3272d8ba0fbed57a71b..f5c145698baad3c3dd0121766e1a1ff09ddb083c 100644
|
| --- a/ash/wm/ash_native_cursor_manager.h
|
| +++ b/ash/wm/classic_ash_native_cursor_manager.h
|
| @@ -1,20 +1,11 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright 2017 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_
|
| -#define ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_
|
| +#ifndef ASH_WM_CLASSIC_ASH_NATIVE_CURSOR_MANAGER_H_
|
| +#define ASH_WM_CLASSIC_ASH_NATIVE_CURSOR_MANAGER_H_
|
|
|
| -#include <memory>
|
| -
|
| -#include "ash/ash_export.h"
|
| -#include "base/compiler_specific.h"
|
| -#include "base/macros.h"
|
| -#include "base/strings/string16.h"
|
| -#include "ui/gfx/geometry/point.h"
|
| -#include "ui/gfx/native_widget_types.h"
|
| -#include "ui/wm/core/native_cursor_manager.h"
|
| -#include "ui/wm/core/native_cursor_manager_delegate.h"
|
| +#include "ash/wm/ash_native_cursor_manager.h"
|
|
|
| namespace ui {
|
| class ImageCursors;
|
| @@ -30,20 +21,19 @@ class CursorManagerTestApi;
|
| // visibility. It communicates back with the CursorManager through the
|
| // NativeCursorManagerDelegate interface, which receives messages about what
|
| // changes were acted on.
|
| -class ASH_EXPORT AshNativeCursorManager : public ::wm::NativeCursorManager {
|
| +class ASH_EXPORT ClassicAshNativeCursorManager : public AshNativeCursorManager {
|
| public:
|
| - AshNativeCursorManager();
|
| - ~AshNativeCursorManager() override;
|
| -
|
| - // Toggle native cursor enabled/disabled.
|
| - // The native cursor is enabled by default. When disabled, we hide the native
|
| - // cursor regardless of visibility state, and let CursorWindowManager draw
|
| - // the cursor.
|
| - void SetNativeCursorEnabled(bool enabled);
|
| + ClassicAshNativeCursorManager();
|
| + ~ClassicAshNativeCursorManager() override;
|
|
|
| private:
|
| friend class test::CursorManagerTestApi;
|
|
|
| + // Overridden from AshNativeCursorManager:
|
| + void SetNativeCursorEnabled(bool enabled) override;
|
| + float GetScale() const override;
|
| + display::Display::Rotation GetRotation() const override;
|
| +
|
| // Overridden from ::wm::NativeCursorManager:
|
| void SetDisplay(const display::Display& display,
|
| ::wm::NativeCursorManagerDelegate* delegate) override;
|
| @@ -64,9 +54,9 @@ class ASH_EXPORT AshNativeCursorManager : public ::wm::NativeCursorManager {
|
|
|
| std::unique_ptr<ui::ImageCursors> image_cursors_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(AshNativeCursorManager);
|
| + DISALLOW_COPY_AND_ASSIGN(ClassicAshNativeCursorManager);
|
| };
|
|
|
| } // namespace ash
|
|
|
| -#endif // ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_
|
| +#endif // ASH_WM_CLASSIC_ASH_NATIVE_CURSOR_MANAGER_H_
|
|
|