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

Unified Diff: ui/ozone/platform/caca/ozone_platform_caca.cc

Issue 802813002: ozone: Move InputControllerTest to a common place (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scoper & remove useless unused annotations Created 6 years 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 | « ui/ozone/ozone.gyp ('k') | ui/ozone/platform/test/input_controller_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/caca/ozone_platform_caca.cc
diff --git a/ui/ozone/platform/caca/ozone_platform_caca.cc b/ui/ozone/platform/caca/ozone_platform_caca.cc
index 7cb20f8869d234ce14f093138e7c8c3c9bb76673..3e06458fb5e6ec76100d0053f708a0b9ea2afd41 100644
--- a/ui/ozone/platform/caca/ozone_platform_caca.cc
+++ b/ui/ozone/platform/caca/ozone_platform_caca.cc
@@ -11,6 +11,7 @@
#include "ui/ozone/public/cursor_factory_ozone.h"
#include "ui/ozone/public/gpu_platform_support.h"
#include "ui/ozone/public/gpu_platform_support_host.h"
+#include "ui/ozone/public/input_controller.h"
#include "ui/ozone/public/ozone_platform.h"
#include "ui/ozone/public/system_input_injector.h"
@@ -31,7 +32,7 @@ class OzonePlatformCaca : public OzonePlatform {
return cursor_factory_ozone_.get();
}
InputController* GetInputController() override {
- return nullptr; // no input setting need
+ return input_controller_.get();
}
GpuPlatformSupport* GetGpuPlatformSupport() override {
return gpu_platform_support_.get();
@@ -60,6 +61,7 @@ class OzonePlatformCaca : public OzonePlatform {
event_source_.reset(new CacaEventSource());
cursor_factory_ozone_.reset(new CursorFactoryOzone());
gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost());
+ input_controller_ = CreateStubInputController();
}
void InitializeGPU() override {
@@ -72,6 +74,7 @@ class OzonePlatformCaca : public OzonePlatform {
scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_;
scoped_ptr<GpuPlatformSupport> gpu_platform_support_;
scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
+ scoped_ptr<InputController> input_controller_;
DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca);
};
« no previous file with comments | « ui/ozone/ozone.gyp ('k') | ui/ozone/platform/test/input_controller_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698