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

Side by Side Diff: ui/ozone/platform/caca/ozone_platform_caca.cc

Issue 1043233003: ozone: Add post message loop initialization hook (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: return without failing Created 5 years, 8 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 unified diff | Download patch
« no previous file with comments | « ui/gl/gl_surface_ozone.cc ('k') | ui/ozone/platform/drm/ozone_platform_drm.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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" 7 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
8 #include "ui/events/ozone/layout/no/no_keyboard_layout_engine.h" 8 #include "ui/events/ozone/layout/no/no_keyboard_layout_engine.h"
9 #include "ui/ozone/common/native_display_delegate_ozone.h" 9 #include "ui/ozone/common/native_display_delegate_ozone.h"
10 #include "ui/ozone/platform/caca/caca_event_source.h" 10 #include "ui/ozone/platform/caca/caca_event_source.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost()); 65 gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost());
66 input_controller_ = CreateStubInputController(); 66 input_controller_ = CreateStubInputController();
67 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine( 67 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
68 make_scoped_ptr(new NoKeyboardLayoutEngine())); 68 make_scoped_ptr(new NoKeyboardLayoutEngine()));
69 } 69 }
70 70
71 void InitializeGPU() override { 71 void InitializeGPU() override {
72 gpu_platform_support_.reset(CreateStubGpuPlatformSupport()); 72 gpu_platform_support_.reset(CreateStubGpuPlatformSupport());
73 } 73 }
74 74
75 void InitializeGpuPostMainLoop() override {}
76
75 private: 77 private:
76 scoped_ptr<CacaWindowManager> window_manager_; 78 scoped_ptr<CacaWindowManager> window_manager_;
77 scoped_ptr<CacaEventSource> event_source_; 79 scoped_ptr<CacaEventSource> event_source_;
78 scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_; 80 scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_;
79 scoped_ptr<GpuPlatformSupport> gpu_platform_support_; 81 scoped_ptr<GpuPlatformSupport> gpu_platform_support_;
80 scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_; 82 scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
81 scoped_ptr<InputController> input_controller_; 83 scoped_ptr<InputController> input_controller_;
82 84
83 DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca); 85 DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca);
84 }; 86 };
85 87
86 } // namespace 88 } // namespace
87 89
88 OzonePlatform* CreateOzonePlatformCaca() { 90 OzonePlatform* CreateOzonePlatformCaca() {
89 return new OzonePlatformCaca; 91 return new OzonePlatformCaca;
90 } 92 }
91 93
92 } // namespace ui 94 } // namespace ui
OLDNEW
« no previous file with comments | « ui/gl/gl_surface_ozone.cc ('k') | ui/ozone/platform/drm/ozone_platform_drm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698