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

Unified Diff: services/ui/ws/platform_display.h

Issue 2161993002: Start using display.mojom.Display in mus+ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@display_traits
Patch Set: Fixes. Created 4 years, 5 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 | « services/ui/ws/display.cc ('k') | services/ui/ws/platform_display.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/platform_display.h
diff --git a/services/ui/ws/platform_display.h b/services/ui/ws/platform_display.h
index 209daebaaaa58fbc3500c36362e61010f76e5878..7ad91855cf7503980f8d2a36fd7d76f34b6b6177 100644
--- a/services/ui/ws/platform_display.h
+++ b/services/ui/ws/platform_display.h
@@ -9,6 +9,7 @@
#include <map>
#include <memory>
+#include <utility>
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
@@ -20,6 +21,7 @@
#include "services/ui/ws/frame_generator.h"
#include "services/ui/ws/frame_generator_delegate.h"
#include "services/ui/ws/platform_display_delegate.h"
+#include "ui/display/display.h"
#include "ui/platform_window/platform_window_delegate.h"
namespace cc {
@@ -70,7 +72,7 @@ class PlatformDisplay {
virtual void SetCursorById(int32_t cursor) = 0;
- virtual mojom::Rotation GetRotation() = 0;
+ virtual ::display::Display::Rotation GetRotation() = 0;
virtual float GetDeviceScaleFactor() = 0;
@@ -115,7 +117,7 @@ class DefaultPlatformDisplay : public PlatformDisplay,
void ReleaseCapture() override;
void SetCursorById(int32_t cursor) override;
float GetDeviceScaleFactor() override;
- mojom::Rotation GetRotation() override;
+ ::display::Display::Rotation GetRotation() override;
void UpdateTextInputState(const ui::TextInputState& state) override;
void SetImeVisibility(bool visible) override;
bool IsFramePending() const override;
« no previous file with comments | « services/ui/ws/display.cc ('k') | services/ui/ws/platform_display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698