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

Side by Side Diff: content/gpu/gpu_main.cc

Issue 1103403002: gpu: Fix dependency cycle between service_sources and config_sources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: zmo nits Created 5 years, 7 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <stdlib.h> 5 #include <stdlib.h>
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <dwmapi.h> 8 #include <dwmapi.h>
9 #include <windows.h> 9 #include <windows.h>
10 #endif 10 #endif
(...skipping 17 matching lines...) Expand all
28 #include "content/common/gpu/media/gpu_video_encode_accelerator.h" 28 #include "content/common/gpu/media/gpu_video_encode_accelerator.h"
29 #include "content/common/sandbox_linux/sandbox_linux.h" 29 #include "content/common/sandbox_linux/sandbox_linux.h"
30 #include "content/gpu/gpu_child_thread.h" 30 #include "content/gpu/gpu_child_thread.h"
31 #include "content/gpu/gpu_process.h" 31 #include "content/gpu/gpu_process.h"
32 #include "content/gpu/gpu_watchdog_thread.h" 32 #include "content/gpu/gpu_watchdog_thread.h"
33 #include "content/public/common/content_client.h" 33 #include "content/public/common/content_client.h"
34 #include "content/public/common/content_switches.h" 34 #include "content/public/common/content_switches.h"
35 #include "content/public/common/main_function_params.h" 35 #include "content/public/common/main_function_params.h"
36 #include "gpu/command_buffer/service/gpu_switches.h" 36 #include "gpu/command_buffer/service/gpu_switches.h"
37 #include "gpu/config/gpu_info_collector.h" 37 #include "gpu/config/gpu_info_collector.h"
38 #include "gpu/config/gpu_switches.h"
38 #include "gpu/config/gpu_util.h" 39 #include "gpu/config/gpu_util.h"
39 #include "ui/events/platform/platform_event_source.h" 40 #include "ui/events/platform/platform_event_source.h"
40 #include "ui/gl/gl_implementation.h" 41 #include "ui/gl/gl_implementation.h"
41 #include "ui/gl/gl_surface.h" 42 #include "ui/gl/gl_surface.h"
42 #include "ui/gl/gl_switches.h" 43 #include "ui/gl/gl_switches.h"
43 #include "ui/gl/gpu_switching_manager.h" 44 #include "ui/gl/gpu_switching_manager.h"
44 45
45 #if defined(OS_WIN) 46 #if defined(OS_WIN)
46 #include "base/win/windows_version.h" 47 #include "base/win/windows_version.h"
47 #include "base/win/scoped_com_initializer.h" 48 #include "base/win/scoped_com_initializer.h"
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 return true; 531 return true;
531 } 532 }
532 533
533 return false; 534 return false;
534 } 535 }
535 #endif // defined(OS_WIN) 536 #endif // defined(OS_WIN)
536 537
537 } // namespace. 538 } // namespace.
538 539
539 } // namespace content 540 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_data_manager_impl_private_unittest.cc ('k') | gpu/command_buffer/service/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698