| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/dri/ozone_platform_dri.h" | 5 #include "ui/ozone/platform/dri/ozone_platform_dri.h" |
| 6 | 6 |
| 7 #include "base/at_exit.h" | 7 #include "base/at_exit.h" |
| 8 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h" | 8 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h" |
| 9 #include "ui/events/ozone/device/device_manager.h" | 9 #include "ui/events/ozone/device/device_manager.h" |
| 10 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h" | 10 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h" |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 PlatformWindowDelegate* delegate, | 77 PlatformWindowDelegate* delegate, |
| 78 const gfx::Rect& bounds) override { | 78 const gfx::Rect& bounds) override { |
| 79 scoped_ptr<DriWindow> platform_window( | 79 scoped_ptr<DriWindow> platform_window( |
| 80 new DriWindow(delegate, bounds, gpu_platform_support_host_.get(), | 80 new DriWindow(delegate, bounds, gpu_platform_support_host_.get(), |
| 81 event_factory_ozone_.get(), cursor_.get(), | 81 event_factory_ozone_.get(), cursor_.get(), |
| 82 window_manager_.get(), display_manager_.get())); | 82 window_manager_.get(), display_manager_.get())); |
| 83 platform_window->Initialize(); | 83 platform_window->Initialize(); |
| 84 return platform_window.Pass(); | 84 return platform_window.Pass(); |
| 85 } | 85 } |
| 86 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { | 86 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { |
| 87 return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateProxy( | 87 return make_scoped_ptr(new NativeDisplayDelegateProxy( |
| 88 gpu_platform_support_host_.get(), device_manager_.get(), | 88 gpu_platform_support_host_.get(), device_manager_.get(), |
| 89 display_manager_.get())); | 89 display_manager_.get())); |
| 90 } | 90 } |
| 91 void InitializeUI() override { | 91 void InitializeUI() override { |
| 92 dri_->Initialize(); | 92 dri_->Initialize(); |
| 93 // This makes sure that simple targets that do not handle display | 93 // This makes sure that simple targets that do not handle display |
| 94 // configuration can still use the primary display. | 94 // configuration can still use the primary display. |
| 95 ForceInitializationOfPrimaryDisplay(dri_, screen_manager_.get()); | 95 ForceInitializationOfPrimaryDisplay(dri_, screen_manager_.get()); |
| 96 drm_device_manager_.reset(new DrmDeviceManager(dri_)); | 96 drm_device_manager_.reset(new DrmDeviceManager(dri_)); |
| 97 display_manager_.reset(new DisplayManager()); | 97 display_manager_.reset(new DisplayManager()); |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 DISALLOW_COPY_AND_ASSIGN(OzonePlatformDri); | 154 DISALLOW_COPY_AND_ASSIGN(OzonePlatformDri); |
| 155 }; | 155 }; |
| 156 | 156 |
| 157 } // namespace | 157 } // namespace |
| 158 | 158 |
| 159 OzonePlatform* CreateOzonePlatformDri() { | 159 OzonePlatform* CreateOzonePlatformDri() { |
| 160 return new OzonePlatformDri; | 160 return new OzonePlatformDri; |
| 161 } | 161 } |
| 162 | 162 |
| 163 } // namespace ui | 163 } // namespace ui |
| OLD | NEW |