| 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/logging.h" | 6 #include "base/logging.h" |
| 7 #include "base/trace_event/trace_event.h" | 7 #include "base/trace_event/trace_event.h" |
| 8 #include "ui/events/devices/device_data_manager.h" | 8 #include "ui/events/devices/device_data_manager.h" |
| 9 #include "ui/ozone/platform_object.h" | 9 #include "ui/ozone/platform_object.h" |
| 10 #include "ui/ozone/platform_selection.h" | 10 #include "ui/ozone/platform_selection.h" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 // TODO(spang): Currently need to leak this object. | 78 // TODO(spang): Currently need to leak this object. |
| 79 OzonePlatform* pl = platform.release(); | 79 OzonePlatform* pl = platform.release(); |
| 80 DCHECK_EQ(instance_, pl); | 80 DCHECK_EQ(instance_, pl); |
| 81 } | 81 } |
| 82 return instance_; | 82 return instance_; |
| 83 } | 83 } |
| 84 | 84 |
| 85 // static | 85 // static |
| 86 OzonePlatform* OzonePlatform::instance_; | 86 OzonePlatform* OzonePlatform::instance_; |
| 87 | 87 |
| 88 // Convenience methods to facilitate transitionning to new API. | |
| 89 void OzonePlatform::InitializeUI(const InitParams& args) { | |
| 90 InitializeUI(); | |
| 91 } | |
| 92 | |
| 93 void OzonePlatform::InitializeGPU(const InitParams& args) { | |
| 94 InitializeGPU(); | |
| 95 } | |
| 96 | |
| 97 IPC::MessageFilter* OzonePlatform::GetGpuMessageFilter() { | 88 IPC::MessageFilter* OzonePlatform::GetGpuMessageFilter() { |
| 98 return nullptr; | 89 return nullptr; |
| 99 } | 90 } |
| 100 | 91 |
| 101 base::MessageLoop::Type OzonePlatform::GetMessageLoopTypeForGpu() { | 92 base::MessageLoop::Type OzonePlatform::GetMessageLoopTypeForGpu() { |
| 102 return base::MessageLoop::TYPE_DEFAULT; | 93 return base::MessageLoop::TYPE_DEFAULT; |
| 103 } | 94 } |
| 104 | 95 |
| 105 void OzonePlatform::AddInterfaces( | 96 void OzonePlatform::AddInterfaces( |
| 106 service_manager::InterfaceRegistry* registry) {} | 97 service_manager::InterfaceRegistry* registry) {} |
| 107 | 98 |
| 108 } // namespace ui | 99 } // namespace ui |
| OLD | NEW |