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

Side by Side Diff: ash/display/extended_mouse_warp_controller.h

Issue 1965073002: Rename gfx::Display to display::Display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 | « ash/BUILD.gn ('k') | ash/display/mirror_window_controller.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 ASH_DISPLAY_EXTENDED_MOUSE_WARP_CONTROLLER_H 5 #ifndef ASH_DISPLAY_EXTENDED_MOUSE_WARP_CONTROLLER_H
6 #define ASH_DISPLAY_EXTENDED_MOUSE_WARP_CONTROLLER_H 6 #define ASH_DISPLAY_EXTENDED_MOUSE_WARP_CONTROLLER_H
7 7
8 #include "ash/display/mouse_warp_controller.h" 8 #include "ash/display/mouse_warp_controller.h"
9 9
10 #include <memory> 10 #include <memory>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "ui/gfx/geometry/rect.h" 15 #include "ui/gfx/geometry/rect.h"
16 16
17 namespace aura { 17 namespace aura {
18 class Window; 18 class Window;
19 } 19 }
20 20
21 namespace display {
22 class Display;
23 }
24
21 namespace gfx { 25 namespace gfx {
22 class Point; 26 class Point;
23 class Display;
24 }
25
26 namespace display {
27 using Display = gfx::Display;
28 } 27 }
29 28
30 namespace ash { 29 namespace ash {
31 namespace test { 30 namespace test {
32 class DisplayManagerTestApi; 31 class DisplayManagerTestApi;
33 } 32 }
34 class SharedDisplayEdgeIndicator; 33 class SharedDisplayEdgeIndicator;
35 34
36 // A MouseWarpController used in extended display mode. 35 // A MouseWarpController used in extended display mode.
37 class ASH_EXPORT ExtendedMouseWarpController : public MouseWarpController { 36 class ASH_EXPORT ExtendedMouseWarpController : public MouseWarpController {
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 bool enabled_; 124 bool enabled_;
126 125
127 bool allow_non_native_event_; 126 bool allow_non_native_event_;
128 127
129 DISALLOW_COPY_AND_ASSIGN(ExtendedMouseWarpController); 128 DISALLOW_COPY_AND_ASSIGN(ExtendedMouseWarpController);
130 }; 129 };
131 130
132 } // namespace ash 131 } // namespace ash
133 132
134 #endif // ASH_DISPLAY_EXTENDED_MOUSE_WARP_CONTROLLER_H 133 #endif // ASH_DISPLAY_EXTENDED_MOUSE_WARP_CONTROLLER_H
OLDNEW
« no previous file with comments | « ash/BUILD.gn ('k') | ash/display/mirror_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698