OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/gpu_process_host.h" | 5 #include "chrome/browser/gpu_process_host.h" |
6 | 6 |
7 #include "app/app_switches.h" | 7 #include "app/app_switches.h" |
8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 #include "chrome/gpu/gpu_thread.h" | 25 #include "chrome/gpu/gpu_thread.h" |
26 #include "grit/browser_resources.h" | 26 #include "grit/browser_resources.h" |
27 #include "ipc/ipc_channel_handle.h" | 27 #include "ipc/ipc_channel_handle.h" |
28 #include "ipc/ipc_switches.h" | 28 #include "ipc/ipc_switches.h" |
29 #include "media/base/media_switches.h" | 29 #include "media/base/media_switches.h" |
30 | 30 |
31 #if defined(OS_LINUX) | 31 #if defined(OS_LINUX) |
32 // These two #includes need to come after render_messages.h. | 32 // These two #includes need to come after render_messages.h. |
33 #include <gdk/gdkwindow.h> // NOLINT | 33 #include <gdk/gdkwindow.h> // NOLINT |
34 #include <gdk/gdkx.h> // NOLINT | 34 #include <gdk/gdkx.h> // NOLINT |
35 #include "app/x11_util.h" | |
36 #include "gfx/gtk_native_view_id_manager.h" | 35 #include "gfx/gtk_native_view_id_manager.h" |
37 #include "gfx/size.h" | 36 #include "gfx/size.h" |
| 37 #include "ui/base/x/x11_util.h" |
38 #endif // defined(OS_LINUX) | 38 #endif // defined(OS_LINUX) |
39 | 39 |
40 namespace { | 40 namespace { |
41 | 41 |
42 enum GPUBlacklistTestResult { | 42 enum GPUBlacklistTestResult { |
43 BLOCKED, | 43 BLOCKED, |
44 ALLOWED, | 44 ALLOWED, |
45 BLACKLIST_TEST_RESULT_MAX | 45 BLACKLIST_TEST_RESULT_MAX |
46 }; | 46 }; |
47 | 47 |
(...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
650 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); | 650 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); |
651 if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) || | 651 if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) || |
652 blacklist->LoadGpuBlacklist(gpu_blacklist_json.as_string(), true)) { | 652 blacklist->LoadGpuBlacklist(gpu_blacklist_json.as_string(), true)) { |
653 gpu_blacklist_.reset(blacklist); | 653 gpu_blacklist_.reset(blacklist); |
654 return true; | 654 return true; |
655 } | 655 } |
656 delete blacklist; | 656 delete blacklist; |
657 return false; | 657 return false; |
658 } | 658 } |
659 | 659 |
OLD | NEW |