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

Side by Side Diff: ui/base/cursor/cursor_loader_x11.h

Issue 1917083002: Move gfx::Display/Screen to display::Display/Screen in ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 unified diff | Download patch
« no previous file with comments | « ui/base/cursor/cursor_loader.h ('k') | ui/base/cursor/cursor_loader_x11.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_BASE_CURSOR_CURSOR_LOADER_X11_H_ 5 #ifndef UI_BASE_CURSOR_CURSOR_LOADER_X11_H_
6 #define UI_BASE_CURSOR_CURSOR_LOADER_X11_H_ 6 #define UI_BASE_CURSOR_CURSOR_LOADER_X11_H_
7 7
8 #include <X11/Xcursor/Xcursor.h> 8 #include <X11/Xcursor/Xcursor.h>
9 #include <map> 9 #include <map>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "ui/base/cursor/cursor.h" 13 #include "ui/base/cursor/cursor.h"
14 #include "ui/base/cursor/cursor_loader.h" 14 #include "ui/base/cursor/cursor_loader.h"
15 #include "ui/base/ui_base_export.h" 15 #include "ui/base/ui_base_export.h"
16 #include "ui/base/x/x11_util.h" 16 #include "ui/base/x/x11_util.h"
17 #include "ui/gfx/display.h"
18 17
19 namespace ui { 18 namespace ui {
20 19
21 class UI_BASE_EXPORT CursorLoaderX11 : public CursorLoader { 20 class UI_BASE_EXPORT CursorLoaderX11 : public CursorLoader {
22 public: 21 public:
23 CursorLoaderX11(); 22 CursorLoaderX11();
24 ~CursorLoaderX11() override; 23 ~CursorLoaderX11() override;
25 24
26 // Overridden from CursorLoader: 25 // Overridden from CursorLoader:
27 void LoadImageCursor(int id, int resource_id, const gfx::Point& hot) override; 26 void LoadImageCursor(int id, int resource_id, const gfx::Point& hot) override;
(...skipping 25 matching lines...) Expand all
53 AnimatedCursorMap animated_cursors_; 52 AnimatedCursorMap animated_cursors_;
54 53
55 const XScopedCursor invisible_cursor_; 54 const XScopedCursor invisible_cursor_;
56 55
57 DISALLOW_COPY_AND_ASSIGN(CursorLoaderX11); 56 DISALLOW_COPY_AND_ASSIGN(CursorLoaderX11);
58 }; 57 };
59 58
60 } // namespace ui 59 } // namespace ui
61 60
62 #endif // UI_BASE_CURSOR_CURSOR_LOADER_X11_H_ 61 #endif // UI_BASE_CURSOR_CURSOR_LOADER_X11_H_
OLDNEW
« no previous file with comments | « ui/base/cursor/cursor_loader.h ('k') | ui/base/cursor/cursor_loader_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698