| Index: ui/base/cursor/cursor_loader_ozone.h
|
| diff --git a/ui/base/cursor/cursor_loader_null.h b/ui/base/cursor/cursor_loader_ozone.h
|
| similarity index 59%
|
| copy from ui/base/cursor/cursor_loader_null.h
|
| copy to ui/base/cursor/cursor_loader_ozone.h
|
| index 5cb9ced1f201deaeef0a5d653ec249ac124309ba..614fdf41d02f48433108d9b3e5ee1774b621621c 100644
|
| --- a/ui/base/cursor/cursor_loader_null.h
|
| +++ b/ui/base/cursor/cursor_loader_ozone.h
|
| @@ -1,36 +1,41 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright 2014 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 UI_BASE_CURSOR_CURSOR_LOADER_NULL_H_
|
| -#define UI_BASE_CURSOR_CURSOR_LOADER_NULL_H_
|
| +#ifndef UI_BASE_CURSOR_CURSOR_LOADER_OZONE_H_
|
| +#define UI_BASE_CURSOR_CURSOR_LOADER_OZONE_H_
|
|
|
| -#include "base/compiler_specific.h"
|
| +#include <map>
|
| +
|
| +#include "third_party/skia/include/core/SkBitmap.h"
|
| #include "ui/base/cursor/cursor_loader.h"
|
| -#include "ui/base/ui_base_export.h"
|
|
|
| namespace ui {
|
|
|
| -class UI_BASE_EXPORT CursorLoaderNull : public CursorLoader {
|
| +class CursorLoaderOzone : public CursorLoader {
|
| public:
|
| - CursorLoaderNull();
|
| - virtual ~CursorLoaderNull();
|
| + CursorLoaderOzone();
|
| + virtual ~CursorLoaderOzone();
|
|
|
| - // Overridden from CursorLoader:
|
| virtual void LoadImageCursor(int id,
|
| int resource_id,
|
| const gfx::Point& hot) OVERRIDE;
|
| +
|
| virtual void LoadAnimatedCursor(int id,
|
| int resource_id,
|
| const gfx::Point& hot,
|
| int frame_delay_ms) OVERRIDE;
|
| +
|
| virtual void UnloadAll() OVERRIDE;
|
| +
|
| virtual void SetPlatformCursor(gfx::NativeCursor* cursor) OVERRIDE;
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(CursorLoaderNull);
|
| + std::map<int, SkBitmap> cursors_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(CursorLoaderOzone);
|
| };
|
|
|
| } // namespace ui
|
|
|
| -#endif // UI_BASE_CURSOR_CURSOR_LOADER_NULL_H_
|
| +#endif // UI_BASE_CURSOR_CURSOR_LOADER_OZONE_H_
|
|
|