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

Unified Diff: ash/display/display_util.h

Issue 2631623003: Remove some ifdefs from ash since it only supports ChromeOS now. (Closed)
Patch Set: revert x11 change 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_util.h
diff --git a/ash/display/display_util.h b/ash/display/display_util.h
index eb2176286eaebf058607567c7fd7fbccfa53ec93..479284037e79e8459784b00f733e87a714777fdc 100644
--- a/ash/display/display_util.h
+++ b/ash/display/display_util.h
@@ -7,7 +7,6 @@
#include <memory>
-#include "ash/ash_export.h"
#include "base/strings/string16.h"
namespace aura {
@@ -36,8 +35,8 @@ std::unique_ptr<MouseWarpController> CreateMouseWarpController(
// Creates edge bounds from |bounds_in_screen| that fits the edge
// of the native window for |ash_host|.
-ASH_EXPORT gfx::Rect GetNativeEdgeBounds(AshWindowTreeHost* ash_host,
- const gfx::Rect& bounds_in_screen);
+gfx::Rect GetNativeEdgeBounds(AshWindowTreeHost* ash_host,
+ const gfx::Rect& bounds_in_screen);
// Moves the cursor to the point inside the |ash_host| that is closest to
// the point_in_screen, which may be outside of the root window.
@@ -47,14 +46,12 @@ void MoveCursorTo(AshWindowTreeHost* ash_host,
const gfx::Point& point_in_screen,
bool update_last_location_now);
-#if defined(OS_CHROMEOS)
// Shows the notification message for display related issues, and optionally
// adds a button to send a feedback report.
void ShowDisplayErrorNotification(const base::string16& message,
bool allow_feedback);
-#endif
-ASH_EXPORT base::string16 GetDisplayErrorNotificationMessageForTest();
+base::string16 GetDisplayErrorNotificationMessageForTest();
} // namespace ash
« 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