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

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

Issue 10985029: linux_aura: Fix cursors and popup menu location (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments Created 8 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ui/views/widget/desktop_root_window_host_linux.h » ('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 "ui/base/cursor/cursor.h" 12 #include "ui/base/cursor/cursor.h"
13 #include "ui/base/cursor/cursor_loader.h" 13 #include "ui/base/cursor/cursor_loader.h"
14 #include "ui/base/ui_export.h"
14 15
15 namespace ui { 16 namespace ui {
16 17
17 class CursorLoaderX11 : public CursorLoader { 18 class UI_EXPORT CursorLoaderX11 : public CursorLoader {
18 public: 19 public:
19 CursorLoaderX11(); 20 CursorLoaderX11();
20 virtual ~CursorLoaderX11(); 21 virtual ~CursorLoaderX11();
21 22
22 // Overridden from CursorLoader: 23 // Overridden from CursorLoader:
23 virtual void LoadImageCursor(int id, 24 virtual void LoadImageCursor(int id,
24 int resource_id, 25 int resource_id,
25 const gfx::Point& hot) OVERRIDE; 26 const gfx::Point& hot) OVERRIDE;
26 virtual void LoadAnimatedCursor(int id, 27 virtual void LoadAnimatedCursor(int id,
27 int resource_id, 28 int resource_id,
(...skipping 21 matching lines...) Expand all
49 AnimatedCursorMap animated_cursors_; 50 AnimatedCursorMap animated_cursors_;
50 51
51 ::Cursor invisible_cursor_; 52 ::Cursor invisible_cursor_;
52 53
53 DISALLOW_COPY_AND_ASSIGN(CursorLoaderX11); 54 DISALLOW_COPY_AND_ASSIGN(CursorLoaderX11);
54 }; 55 };
55 56
56 } // namespace ui 57 } // namespace ui
57 58
58 #endif // UI_BASE_CURSOR_CURSOR_LOADER_X11_H_ 59 #endif // UI_BASE_CURSOR_CURSOR_LOADER_X11_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/widget/desktop_root_window_host_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698