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

Unified Diff: services/ui/ws/display.cc

Issue 2795503002: mash: Don't synthesize extra key press events in the window server (Closed)
Patch Set: remove InputMethodBridge workaround Created 3 years, 8 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.h ('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/display.cc
diff --git a/services/ui/ws/display.cc b/services/ui/ws/display.cc
index 3513568e318a7d80f5525fa94f486e3f5d86a136..73c299d085330fe1ccd520ec7f540bdace1d033d 100644
--- a/services/ui/ws/display.cc
+++ b/services/ui/ws/display.cc
@@ -29,6 +29,10 @@
#include "ui/base/cursor/cursor.h"
#include "ui/display/screen.h"
+#if defined(USE_OZONE)
+#include "ui/ozone/public/ozone_platform.h"
+#endif
+
namespace ui {
namespace ws {
@@ -276,6 +280,14 @@ void Display::OnNativeCaptureLost() {
display_root->window_manager_state()->SetCapture(nullptr, kInvalidClientId);
}
+OzonePlatform* Display::GetOzonePlatform() {
+#if defined(USE_OZONE)
+ return OzonePlatform::GetInstance();
+#else
+ return nullptr;
+#endif
+}
+
void Display::OnViewportMetricsChanged(
const display::ViewportMetrics& metrics) {
platform_display_->UpdateViewportMetrics(metrics);
« no previous file with comments | « services/ui/ws/display.h ('k') | services/ui/ws/platform_display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698