OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/ozone/platform/caca/ozone_platform_caca.h" | 5 #include "ui/ozone/platform/caca/ozone_platform_caca.h" |
6 | 6 |
| 7 #include "ui/ozone/common/window/platform_window_compat.h" |
7 #include "ui/ozone/platform/caca/caca_connection.h" | 8 #include "ui/ozone/platform/caca/caca_connection.h" |
8 #include "ui/ozone/platform/caca/caca_event_factory.h" | 9 #include "ui/ozone/platform/caca/caca_event_factory.h" |
9 #include "ui/ozone/platform/caca/caca_surface_factory.h" | 10 #include "ui/ozone/platform/caca/caca_surface_factory.h" |
10 #include "ui/ozone/public/cursor_factory_ozone.h" | 11 #include "ui/ozone/public/cursor_factory_ozone.h" |
11 #include "ui/ozone/public/ozone_platform.h" | 12 #include "ui/ozone/public/ozone_platform.h" |
12 | 13 |
13 #if defined(OS_CHROMEOS) | 14 #if defined(OS_CHROMEOS) |
14 #include "ui/ozone/common/chromeos/native_display_delegate_ozone.h" | 15 #include "ui/ozone/common/chromeos/native_display_delegate_ozone.h" |
15 #include "ui/ozone/common/chromeos/touchscreen_device_manager_ozone.h" | 16 #include "ui/ozone/common/chromeos/touchscreen_device_manager_ozone.h" |
16 #endif | 17 #endif |
(...skipping 16 matching lines...) Expand all Loading... |
33 } | 34 } |
34 virtual CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE { | 35 virtual CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE { |
35 return cursor_factory_ozone_.get(); | 36 return cursor_factory_ozone_.get(); |
36 } | 37 } |
37 virtual GpuPlatformSupport* GetGpuPlatformSupport() OVERRIDE { | 38 virtual GpuPlatformSupport* GetGpuPlatformSupport() OVERRIDE { |
38 return NULL; // no GPU support | 39 return NULL; // no GPU support |
39 } | 40 } |
40 virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() OVERRIDE { | 41 virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() OVERRIDE { |
41 return NULL; // no GPU support | 42 return NULL; // no GPU support |
42 } | 43 } |
| 44 virtual scoped_ptr<PlatformWindow> CreatePlatformWindow( |
| 45 PlatformWindowDelegate* delegate, |
| 46 const gfx::Rect& bounds) OVERRIDE { |
| 47 return make_scoped_ptr<PlatformWindow>( |
| 48 new PlatformWindowCompat(delegate, bounds)); |
| 49 } |
43 | 50 |
44 #if defined(OS_CHROMEOS) | 51 #if defined(OS_CHROMEOS) |
45 virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() | 52 virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() |
46 OVERRIDE { | 53 OVERRIDE { |
47 return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone()); | 54 return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone()); |
48 } | 55 } |
49 virtual scoped_ptr<TouchscreenDeviceManager> | 56 virtual scoped_ptr<TouchscreenDeviceManager> |
50 CreateTouchscreenDeviceManager() OVERRIDE { | 57 CreateTouchscreenDeviceManager() OVERRIDE { |
51 return scoped_ptr<TouchscreenDeviceManager>( | 58 return scoped_ptr<TouchscreenDeviceManager>( |
52 new TouchscreenDeviceManagerOzone()); | 59 new TouchscreenDeviceManagerOzone()); |
(...skipping 15 matching lines...) Expand all Loading... |
68 scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_; | 75 scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_; |
69 | 76 |
70 DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca); | 77 DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca); |
71 }; | 78 }; |
72 | 79 |
73 } // namespace | 80 } // namespace |
74 | 81 |
75 OzonePlatform* CreateOzonePlatformCaca() { return new OzonePlatformCaca; } | 82 OzonePlatform* CreateOzonePlatformCaca() { return new OzonePlatformCaca; } |
76 | 83 |
77 } // namespace ui | 84 } // namespace ui |
OLD | NEW |