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

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

Issue 2631623003: 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
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 "ash/ash_export.h"
(...skipping 18 matching lines...) Expand all
29 29
30 // Creates a MouseWarpController for the current display 30 // Creates a MouseWarpController for the current display
31 // configuration. |drag_source| is the window where dragging 31 // configuration. |drag_source| is the window where dragging
32 // started, or nullptr otherwise. 32 // started, or nullptr otherwise.
33 std::unique_ptr<MouseWarpController> CreateMouseWarpController( 33 std::unique_ptr<MouseWarpController> CreateMouseWarpController(
34 display::DisplayManager* manager, 34 display::DisplayManager* manager,
35 aura::Window* drag_source); 35 aura::Window* drag_source);
36 36
37 // Creates edge bounds from |bounds_in_screen| that fits the edge 37 // Creates edge bounds from |bounds_in_screen| that fits the edge
38 // of the native window for |ash_host|. 38 // of the native window for |ash_host|.
39 ASH_EXPORT gfx::Rect GetNativeEdgeBounds(AshWindowTreeHost* ash_host, 39 ASH_EXPORT gfx::Rect GetNativeEdgeBounds(AshWindowTreeHost* ash_host,
Evan Stade 2017/01/13 17:19:34 I don't actually know why these EXPORTs are necess
James Cook 2017/01/13 20:19:31 Huh. I thought they were necessary for unit tests
40 const gfx::Rect& bounds_in_screen); 40 const gfx::Rect& bounds_in_screen);
41 41
42 // 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
43 // 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.
44 // |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
45 // location synchronously. 45 // location synchronously.
46 void MoveCursorTo(AshWindowTreeHost* ash_host, 46 void MoveCursorTo(AshWindowTreeHost* ash_host,
47 const gfx::Point& point_in_screen, 47 const gfx::Point& point_in_screen,
48 bool update_last_location_now); 48 bool update_last_location_now);
49 49
50 #if defined(OS_CHROMEOS)
51 // Shows the notification message for display related issues, and optionally 50 // Shows the notification message for display related issues, and optionally
52 // adds a button to send a feedback report. 51 // adds a button to send a feedback report.
53 void ShowDisplayErrorNotification(const base::string16& message, 52 void ShowDisplayErrorNotification(const base::string16& message,
54 bool allow_feedback); 53 bool allow_feedback);
55 #endif
56 54
57 ASH_EXPORT base::string16 GetDisplayErrorNotificationMessageForTest(); 55 ASH_EXPORT base::string16 GetDisplayErrorNotificationMessageForTest();
58 56
59 } // namespace ash 57 } // namespace ash
60 58
61 #endif // ASH_DISPLAY_DISPLAY_UTIL_H_ 59 #endif // ASH_DISPLAY_DISPLAY_UTIL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698