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

Unified Diff: services/ui/ws/platform_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.cc ('k') | services/ui/ws/platform_display_default.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/platform_display.cc
diff --git a/services/ui/ws/platform_display.cc b/services/ui/ws/platform_display.cc
index 36d8b65676374a7dc3e9650e1fd812773d3caf88..587e4508e446f6ba96bf234413ab5a9834e06c3b 100644
--- a/services/ui/ws/platform_display.cc
+++ b/services/ui/ws/platform_display.cc
@@ -8,6 +8,7 @@
#include "services/ui/ws/platform_display_default.h"
#include "services/ui/ws/platform_display_factory.h"
#include "services/ui/ws/server_window.h"
+#include "ui/base/cursor/image_cursors.h"
namespace ui {
namespace ws {
@@ -22,7 +23,13 @@ std::unique_ptr<PlatformDisplay> PlatformDisplay::Create(
if (factory_)
return factory_->CreatePlatformDisplay(root, metrics);
- return base::MakeUnique<PlatformDisplayDefault>(root, metrics);
+#if defined(OS_ANDROID)
+ return base::MakeUnique<PlatformDisplayDefault>(root, metrics,
+ nullptr /* image_cursors */);
+#else
+ return base::MakeUnique<PlatformDisplayDefault>(
+ root, metrics, base::MakeUnique<ImageCursors>());
+#endif
}
} // namespace ws
« no previous file with comments | « services/ui/ws/display.cc ('k') | services/ui/ws/platform_display_default.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698