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

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

Issue 22301011: Removed errant #include leftover from r215933. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
(...skipping 22 matching lines...) Expand all
33 #include "ui/gl/gl_surface.h" 33 #include "ui/gl/gl_surface.h"
34 #include "ui/gl/gl_switches.h" 34 #include "ui/gl/gl_switches.h"
35 #include "ui/gl/gpu_switching_manager.h" 35 #include "ui/gl/gpu_switching_manager.h"
36 36
37 #if defined(OS_WIN) 37 #if defined(OS_WIN)
38 #include "base/win/scoped_com_initializer.h" 38 #include "base/win/scoped_com_initializer.h"
39 #include "content/common/gpu/media/dxva_video_decode_accelerator.h" 39 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
40 #include "sandbox/win/src/sandbox.h" 40 #include "sandbox/win/src/sandbox.h"
41 #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_X11) 41 #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_X11)
42 #include "content/common/gpu/media/exynos_video_decode_accelerator.h" 42 #include "content/common/gpu/media/exynos_video_decode_accelerator.h"
43 #include "content/common/gpu/media/omx_video_decode_accelerator.h"
44 #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11) 43 #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)
45 #include "content/common/gpu/media/vaapi_wrapper.h" 44 #include "content/common/gpu/media/vaapi_wrapper.h"
46 #endif 45 #endif
47 46
48 #if defined(USE_X11) 47 #if defined(USE_X11)
49 #include "ui/base/x/x11_util.h" 48 #include "ui/base/x/x11_util.h"
50 #endif 49 #endif
51 50
52 #if defined(OS_LINUX) 51 #if defined(OS_LINUX)
53 #include "content/public/common/sandbox_init.h" 52 #include "content/public/common/sandbox_init.h"
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 return true; 426 return true;
428 } 427 }
429 428
430 return false; 429 return false;
431 } 430 }
432 #endif // defined(OS_WIN) 431 #endif // defined(OS_WIN)
433 432
434 } // namespace. 433 } // namespace.
435 434
436 } // namespace content 435 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698