| 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/events/ozone/layout/keyboard_layout_engine_manager.h" | 
|  | 8 #include "ui/events/ozone/layout/no/no_keyboard_layout_engine.h" | 
| 7 #include "ui/ozone/common/native_display_delegate_ozone.h" | 9 #include "ui/ozone/common/native_display_delegate_ozone.h" | 
| 8 #include "ui/ozone/platform/caca/caca_event_source.h" | 10 #include "ui/ozone/platform/caca/caca_event_source.h" | 
| 9 #include "ui/ozone/platform/caca/caca_window.h" | 11 #include "ui/ozone/platform/caca/caca_window.h" | 
| 10 #include "ui/ozone/platform/caca/caca_window_manager.h" | 12 #include "ui/ozone/platform/caca/caca_window_manager.h" | 
| 11 #include "ui/ozone/public/cursor_factory_ozone.h" | 13 #include "ui/ozone/public/cursor_factory_ozone.h" | 
| 12 #include "ui/ozone/public/gpu_platform_support.h" | 14 #include "ui/ozone/public/gpu_platform_support.h" | 
| 13 #include "ui/ozone/public/gpu_platform_support_host.h" | 15 #include "ui/ozone/public/gpu_platform_support_host.h" | 
| 14 #include "ui/ozone/public/input_controller.h" | 16 #include "ui/ozone/public/input_controller.h" | 
| 15 #include "ui/ozone/public/ozone_platform.h" | 17 #include "ui/ozone/public/ozone_platform.h" | 
| 16 #include "ui/ozone/public/system_input_injector.h" | 18 #include "ui/ozone/public/system_input_injector.h" | 
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 55   scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { | 57   scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { | 
| 56     return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone()); | 58     return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone()); | 
| 57   } | 59   } | 
| 58 | 60 | 
| 59   void InitializeUI() override { | 61   void InitializeUI() override { | 
| 60     window_manager_.reset(new CacaWindowManager); | 62     window_manager_.reset(new CacaWindowManager); | 
| 61     event_source_.reset(new CacaEventSource()); | 63     event_source_.reset(new CacaEventSource()); | 
| 62     cursor_factory_ozone_.reset(new CursorFactoryOzone()); | 64     cursor_factory_ozone_.reset(new CursorFactoryOzone()); | 
| 63     gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost()); | 65     gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost()); | 
| 64     input_controller_ = CreateStubInputController(); | 66     input_controller_ = CreateStubInputController(); | 
|  | 67     KeyboardLayoutEngineManager::SetKeyboardLayoutEngine( | 
|  | 68         make_scoped_ptr(new NoKeyboardLayoutEngine())); | 
| 65   } | 69   } | 
| 66 | 70 | 
| 67   void InitializeGPU() override { | 71   void InitializeGPU() override { | 
| 68     gpu_platform_support_.reset(CreateStubGpuPlatformSupport()); | 72     gpu_platform_support_.reset(CreateStubGpuPlatformSupport()); | 
| 69   } | 73   } | 
| 70 | 74 | 
| 71  private: | 75  private: | 
| 72   scoped_ptr<CacaWindowManager> window_manager_; | 76   scoped_ptr<CacaWindowManager> window_manager_; | 
| 73   scoped_ptr<CacaEventSource> event_source_; | 77   scoped_ptr<CacaEventSource> event_source_; | 
| 74   scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_; | 78   scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_; | 
| 75   scoped_ptr<GpuPlatformSupport> gpu_platform_support_; | 79   scoped_ptr<GpuPlatformSupport> gpu_platform_support_; | 
| 76   scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_; | 80   scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_; | 
| 77   scoped_ptr<InputController> input_controller_; | 81   scoped_ptr<InputController> input_controller_; | 
| 78 | 82 | 
| 79   DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca); | 83   DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca); | 
| 80 }; | 84 }; | 
| 81 | 85 | 
| 82 }  // namespace | 86 }  // namespace | 
| 83 | 87 | 
| 84 OzonePlatform* CreateOzonePlatformCaca() { return new OzonePlatformCaca; } | 88 OzonePlatform* CreateOzonePlatformCaca() { | 
|  | 89   return new OzonePlatformCaca; | 
|  | 90 } | 
| 85 | 91 | 
| 86 }  // namespace ui | 92 }  // namespace ui | 
| OLD | NEW | 
|---|