| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/gpu/gpu_data_manager_impl_private.h" | 5 #include "content/browser/gpu/gpu_data_manager_impl_private.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 #include "ui/gl/gl_implementation.h" | 35 #include "ui/gl/gl_implementation.h" |
| 36 #include "ui/gl/gl_switches.h" | 36 #include "ui/gl/gl_switches.h" |
| 37 #include "ui/gl/gpu_switching_manager.h" | 37 #include "ui/gl/gpu_switching_manager.h" |
| 38 | 38 |
| 39 #if defined(OS_MACOSX) | 39 #if defined(OS_MACOSX) |
| 40 #include <ApplicationServices/ApplicationServices.h> | 40 #include <ApplicationServices/ApplicationServices.h> |
| 41 #endif // OS_MACOSX | 41 #endif // OS_MACOSX |
| 42 #if defined(OS_WIN) | 42 #if defined(OS_WIN) |
| 43 #include "base/win/windows_version.h" | 43 #include "base/win/windows_version.h" |
| 44 #endif // OS_WIN | 44 #endif // OS_WIN |
| 45 #if defined(OS_ANDROID) | |
| 46 #include "ui/gfx/android/device_display_info.h" | |
| 47 #endif // OS_ANDROID | |
| 48 | 45 |
| 49 namespace content { | 46 namespace content { |
| 50 | 47 |
| 51 namespace { | 48 namespace { |
| 52 | 49 |
| 53 enum GpuFeatureStatus { | 50 enum GpuFeatureStatus { |
| 54 kGpuFeatureEnabled = 0, | 51 kGpuFeatureEnabled = 0, |
| 55 kGpuFeatureBlacklisted = 1, | 52 kGpuFeatureBlacklisted = 1, |
| 56 kGpuFeatureDisabled = 2, // disabled by user but not blacklisted | 53 kGpuFeatureDisabled = 2, // disabled by user but not blacklisted |
| 57 kGpuFeatureNumStatus | 54 kGpuFeatureNumStatus |
| (...skipping 1148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1206 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; | 1203 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; |
| 1207 #if defined(OS_WIN) | 1204 #if defined(OS_WIN) |
| 1208 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; | 1205 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; |
| 1209 #endif | 1206 #endif |
| 1210 complete_gpu_info_already_requested_ = true; | 1207 complete_gpu_info_already_requested_ = true; |
| 1211 // Some observers might be waiting. | 1208 // Some observers might be waiting. |
| 1212 NotifyGpuInfoUpdate(); | 1209 NotifyGpuInfoUpdate(); |
| 1213 } | 1210 } |
| 1214 | 1211 |
| 1215 } // namespace content | 1212 } // namespace content |
| OLD | NEW |