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

Unified Diff: ui/ozone/platform/test/ozone_platform_test.cc

Issue 1128113011: ozone: Introduce ClientPixmap and ClientPixmapFactory for non-GPU processes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: NativePixmapManager is singleton Created 5 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
Index: ui/ozone/platform/test/ozone_platform_test.cc
diff --git a/ui/ozone/platform/test/ozone_platform_test.cc b/ui/ozone/platform/test/ozone_platform_test.cc
index c6da9e3aa73aff483f148a75538f4c894feea749..789d752c9681a78b128656990a712359501e0b12 100644
--- a/ui/ozone/platform/test/ozone_platform_test.cc
+++ b/ui/ozone/platform/test/ozone_platform_test.cc
@@ -5,6 +5,7 @@
#include "ui/ozone/platform/test/ozone_platform_test.h"
#include "base/command_line.h"
+#include "base/file_descriptor_posix.h"
#include "base/files/file_path.h"
#include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
#include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
@@ -18,6 +19,7 @@
#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/native_pixmap_manager.h"
#include "ui/ozone/public/ozone_platform.h"
#include "ui/ozone/public/ozone_switches.h"
#include "ui/ozone/public/system_input_injector.h"
@@ -76,6 +78,9 @@ class OzonePlatformTest : public OzonePlatform {
scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override {
return make_scoped_ptr(new NativeDisplayDelegateOzone());
}
+ base::FileDescriptor GetVirtualDeviceFd() override {
+ return base::FileDescriptor();
+ }
void InitializeUI() override {
window_manager_.reset(new TestWindowManager(file_path_));
@@ -119,4 +124,8 @@ OzonePlatform* CreateOzonePlatformTest() {
return new OzonePlatformTest(location);
}
+NativePixmapManager* CreateNativePixmapManagerTest() {
+ return CreateStubNativePixmapManager();
+}
+
} // namespace ui

Powered by Google App Engine
This is Rietveld 408576698