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

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

Issue 2639323003: Revert of Remove some ifdefs from ash since it only supports ChromeOS now. (Closed)
Patch Set: Created 3 years, 11 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/display/display_configuration_controller.cc ('k') | ash/display/display_util.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_DISPLAY_UTIL_H_ 5 #ifndef ASH_DISPLAY_DISPLAY_UTIL_H_
6 #define ASH_DISPLAY_DISPLAY_UTIL_H_ 6 #define ASH_DISPLAY_DISPLAY_UTIL_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h"
10 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
11 12
12 namespace aura { 13 namespace aura {
13 class Window; 14 class Window;
14 } 15 }
15 16
16 namespace display { 17 namespace display {
17 class DisplayManager; 18 class DisplayManager;
18 } 19 }
19 20
20 namespace gfx { 21 namespace gfx {
21 class Point; 22 class Point;
22 class Rect; 23 class Rect;
23 } 24 }
24 25
25 namespace ash { 26 namespace ash {
26 class AshWindowTreeHost; 27 class AshWindowTreeHost;
27 class MouseWarpController; 28 class MouseWarpController;
28 29
29 // Creates a MouseWarpController for the current display 30 // Creates a MouseWarpController for the current display
30 // configuration. |drag_source| is the window where dragging 31 // configuration. |drag_source| is the window where dragging
31 // started, or nullptr otherwise. 32 // started, or nullptr otherwise.
32 std::unique_ptr<MouseWarpController> CreateMouseWarpController( 33 std::unique_ptr<MouseWarpController> CreateMouseWarpController(
33 display::DisplayManager* manager, 34 display::DisplayManager* manager,
34 aura::Window* drag_source); 35 aura::Window* drag_source);
35 36
36 // Creates edge bounds from |bounds_in_screen| that fits the edge 37 // Creates edge bounds from |bounds_in_screen| that fits the edge
37 // of the native window for |ash_host|. 38 // of the native window for |ash_host|.
38 gfx::Rect GetNativeEdgeBounds(AshWindowTreeHost* ash_host, 39 ASH_EXPORT gfx::Rect GetNativeEdgeBounds(AshWindowTreeHost* ash_host,
39 const gfx::Rect& bounds_in_screen); 40 const gfx::Rect& bounds_in_screen);
40 41
41 // Moves the cursor to the point inside the |ash_host| that is closest to 42 // Moves the cursor to the point inside the |ash_host| that is closest to
42 // the point_in_screen, which may be outside of the root window. 43 // the point_in_screen, which may be outside of the root window.
43 // |update_last_loation_now| is used for the test to update the mouse 44 // |update_last_loation_now| is used for the test to update the mouse
44 // location synchronously. 45 // location synchronously.
45 void MoveCursorTo(AshWindowTreeHost* ash_host, 46 void MoveCursorTo(AshWindowTreeHost* ash_host,
46 const gfx::Point& point_in_screen, 47 const gfx::Point& point_in_screen,
47 bool update_last_location_now); 48 bool update_last_location_now);
48 49
50 #if defined(OS_CHROMEOS)
49 // Shows the notification message for display related issues, and optionally 51 // Shows the notification message for display related issues, and optionally
50 // adds a button to send a feedback report. 52 // adds a button to send a feedback report.
51 void ShowDisplayErrorNotification(const base::string16& message, 53 void ShowDisplayErrorNotification(const base::string16& message,
52 bool allow_feedback); 54 bool allow_feedback);
55 #endif
53 56
54 base::string16 GetDisplayErrorNotificationMessageForTest(); 57 ASH_EXPORT base::string16 GetDisplayErrorNotificationMessageForTest();
55 58
56 } // namespace ash 59 } // namespace ash
57 60
58 #endif // ASH_DISPLAY_DISPLAY_UTIL_H_ 61 #endif // ASH_DISPLAY_DISPLAY_UTIL_H_
OLDNEW
« no previous file with comments | « ash/display/display_configuration_controller.cc ('k') | ash/display/display_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698