| 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 "base/macros.h" | 7 #include "base/macros.h" | 
| 8 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h" | 8 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h" | 
| 9 #include "ui/events/ozone/layout/no/no_keyboard_layout_engine.h" | 9 #include "ui/events/ozone/layout/no/no_keyboard_layout_engine.h" | 
| 10 #include "ui/ozone/common/native_display_delegate_ozone.h" | 10 #include "ui/ozone/common/native_display_delegate_ozone.h" | 
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 50   scoped_ptr<SystemInputInjector> CreateSystemInputInjector() override { | 50   scoped_ptr<SystemInputInjector> CreateSystemInputInjector() override { | 
| 51     return nullptr;  // no input injection support. | 51     return nullptr;  // no input injection support. | 
| 52   } | 52   } | 
| 53   scoped_ptr<PlatformWindow> CreatePlatformWindow( | 53   scoped_ptr<PlatformWindow> CreatePlatformWindow( | 
| 54       PlatformWindowDelegate* delegate, | 54       PlatformWindowDelegate* delegate, | 
| 55       const gfx::Rect& bounds) override { | 55       const gfx::Rect& bounds) override { | 
| 56     scoped_ptr<CacaWindow> caca_window(new CacaWindow( | 56     scoped_ptr<CacaWindow> caca_window(new CacaWindow( | 
| 57         delegate, window_manager_.get(), event_source_.get(), bounds)); | 57         delegate, window_manager_.get(), event_source_.get(), bounds)); | 
| 58     if (!caca_window->Initialize()) | 58     if (!caca_window->Initialize()) | 
| 59       return nullptr; | 59       return nullptr; | 
| 60     return caca_window; | 60     return std::move(caca_window); | 
| 61   } | 61   } | 
| 62   scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { | 62   scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { | 
| 63     return make_scoped_ptr(new NativeDisplayDelegateOzone()); | 63     return make_scoped_ptr(new NativeDisplayDelegateOzone()); | 
| 64   } | 64   } | 
| 65   base::ScopedFD OpenClientNativePixmapDevice() const override { | 65   base::ScopedFD OpenClientNativePixmapDevice() const override { | 
| 66     return base::ScopedFD(); | 66     return base::ScopedFD(); | 
| 67   } | 67   } | 
| 68 | 68 | 
| 69   void InitializeUI() override { | 69   void InitializeUI() override { | 
| 70     window_manager_.reset(new CacaWindowManager); | 70     window_manager_.reset(new CacaWindowManager); | 
| (...skipping 22 matching lines...) Expand all  Loading... | 
| 93   DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca); | 93   DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca); | 
| 94 }; | 94 }; | 
| 95 | 95 | 
| 96 }  // namespace | 96 }  // namespace | 
| 97 | 97 | 
| 98 OzonePlatform* CreateOzonePlatformCaca() { | 98 OzonePlatform* CreateOzonePlatformCaca() { | 
| 99   return new OzonePlatformCaca; | 99   return new OzonePlatformCaca; | 
| 100 } | 100 } | 
| 101 | 101 | 
| 102 }  // namespace ui | 102 }  // namespace ui | 
| OLD | NEW | 
|---|