| OLD | NEW |
| 1 // Copyright (c) 2012 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 "content/browser/aura/image_transport_factory.h" | 5 #include "content/browser/compositor/image_transport_factory.h" |
| 6 | 6 |
| 7 #include "content/browser/aura/gpu_process_transport_factory.h" | 7 #include "content/browser/compositor/gpu_process_transport_factory.h" |
| 8 #include "content/browser/aura/no_transport_image_transport_factory.h" | 8 #include "content/browser/compositor/no_transport_image_transport_factory.h" |
| 9 #include "ui/compositor/compositor.h" | 9 #include "ui/compositor/compositor.h" |
| 10 | 10 |
| 11 namespace content { | 11 namespace content { |
| 12 | 12 |
| 13 namespace { | 13 namespace { |
| 14 ImageTransportFactory* g_factory = NULL; | 14 ImageTransportFactory* g_factory = NULL; |
| 15 bool g_initialized_for_unit_tests = false; | 15 bool g_initialized_for_unit_tests = false; |
| 16 } | 16 } |
| 17 | 17 |
| 18 // static | 18 // static |
| (...skipping 21 matching lines...) Expand all Loading... |
| 40 g_factory = NULL; | 40 g_factory = NULL; |
| 41 g_initialized_for_unit_tests = false; | 41 g_initialized_for_unit_tests = false; |
| 42 } | 42 } |
| 43 | 43 |
| 44 // static | 44 // static |
| 45 ImageTransportFactory* ImageTransportFactory::GetInstance() { | 45 ImageTransportFactory* ImageTransportFactory::GetInstance() { |
| 46 return g_factory; | 46 return g_factory; |
| 47 } | 47 } |
| 48 | 48 |
| 49 } // namespace content | 49 } // namespace content |
| OLD | NEW |