| 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/debug/trace_event.h" | 6 #include "base/debug/trace_event.h" |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "ui/events/device_data_manager.h" | 8 #include "ui/events/device_data_manager.h" |
| 9 #include "ui/ozone/ozone_platform.h" | |
| 10 #include "ui/ozone/ozone_switches.h" | |
| 11 #include "ui/ozone/platform_object.h" | 9 #include "ui/ozone/platform_object.h" |
| 12 #include "ui/ozone/platform_selection.h" | 10 #include "ui/ozone/platform_selection.h" |
| 11 #include "ui/ozone/public/ozone_platform.h" |
| 12 #include "ui/ozone/public/ozone_switches.h" |
| 13 | 13 |
| 14 namespace ui { | 14 namespace ui { |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 bool g_platform_initialized_ui = false; | 18 bool g_platform_initialized_ui = false; |
| 19 bool g_platform_initialized_gpu = false; | 19 bool g_platform_initialized_gpu = false; |
| 20 | 20 |
| 21 } | 21 } |
| 22 | 22 |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 | 71 |
| 72 // TODO(spang): Currently need to leak this object. | 72 // TODO(spang): Currently need to leak this object. |
| 73 CHECK_EQ(instance_, platform.release()); | 73 CHECK_EQ(instance_, platform.release()); |
| 74 } | 74 } |
| 75 } | 75 } |
| 76 | 76 |
| 77 // static | 77 // static |
| 78 OzonePlatform* OzonePlatform::instance_; | 78 OzonePlatform* OzonePlatform::instance_; |
| 79 | 79 |
| 80 } // namespace ui | 80 } // namespace ui |
| OLD | NEW |