Chromium Code Reviews| Index: content/browser/compositor/gpu_process_transport_factory.cc |
| diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc |
| index 93ecf0e05e52081706fd4b8c92a67c5eb9467016..7a2f6f4c45e8b55ac0443caa2707a085e42ce485 100644 |
| --- a/content/browser/compositor/gpu_process_transport_factory.cc |
| +++ b/content/browser/compositor/gpu_process_transport_factory.cc |
| @@ -38,7 +38,6 @@ |
| #include "content/browser/compositor/offscreen_browser_compositor_output_surface.h" |
| #include "content/browser/compositor/reflector_impl.h" |
| #include "content/browser/compositor/software_browser_compositor_output_surface.h" |
| -#include "content/browser/compositor/software_output_device_mus.h" |
| #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" |
| #include "content/browser/gpu/gpu_data_manager_impl.h" |
| #include "content/browser/renderer_host/render_widget_host_impl.h" |
| @@ -202,8 +201,8 @@ GpuProcessTransportFactory::CreateSoftwareOutputDevice( |
| ui::Compositor* compositor) { |
| #if defined(USE_AURA) |
|
danakj
2016/08/15 18:32:58
Or maybe just remove this whole if block? Up to yo
sadrul
2016/08/15 22:39:41
I am keeping it for now, to catch cases where we m
|
| if (shell::ShellIsRemote()) { |
| - return std::unique_ptr<cc::SoftwareOutputDevice>( |
| - new SoftwareOutputDeviceMus(compositor)); |
| + NOTREACHED(); |
| + return nullptr; |
| } |
| #endif |