| 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 <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 #include "ui/gl/gpu_switching_manager.h" | 43 #include "ui/gl/gpu_switching_manager.h" |
| 44 | 44 |
| 45 #if defined(OS_MACOSX) | 45 #if defined(OS_MACOSX) |
| 46 #include <ApplicationServices/ApplicationServices.h> | 46 #include <ApplicationServices/ApplicationServices.h> |
| 47 #endif // OS_MACOSX | 47 #endif // OS_MACOSX |
| 48 #if defined(OS_WIN) | 48 #if defined(OS_WIN) |
| 49 #include "base/win/windows_version.h" | 49 #include "base/win/windows_version.h" |
| 50 #endif // OS_WIN | 50 #endif // OS_WIN |
| 51 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA) | 51 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA) |
| 52 #include "services/shell/runner/common/client_util.h" // nogncheck | 52 #include "services/shell/runner/common/client_util.h" // nogncheck |
| 53 #include "services/ui/common/gpu_service.h" // nogncheck | 53 #include "services/ui/public/cpp/gpu_service.h" // nogncheck |
| 54 #endif | 54 #endif |
| 55 | 55 |
| 56 namespace content { | 56 namespace content { |
| 57 | 57 |
| 58 namespace { | 58 namespace { |
| 59 | 59 |
| 60 enum GpuFeatureStatus { | 60 enum GpuFeatureStatus { |
| 61 kGpuFeatureEnabled = 0, | 61 kGpuFeatureEnabled = 0, |
| 62 kGpuFeatureBlacklisted = 1, | 62 kGpuFeatureBlacklisted = 1, |
| 63 kGpuFeatureDisabled = 2, // disabled by user but not blacklisted | 63 kGpuFeatureDisabled = 2, // disabled by user but not blacklisted |
| (...skipping 1228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1292 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; | 1292 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; |
| 1293 #if defined(OS_WIN) | 1293 #if defined(OS_WIN) |
| 1294 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; | 1294 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; |
| 1295 #endif | 1295 #endif |
| 1296 complete_gpu_info_already_requested_ = true; | 1296 complete_gpu_info_already_requested_ = true; |
| 1297 // Some observers might be waiting. | 1297 // Some observers might be waiting. |
| 1298 NotifyGpuInfoUpdate(); | 1298 NotifyGpuInfoUpdate(); |
| 1299 } | 1299 } |
| 1300 | 1300 |
| 1301 } // namespace content | 1301 } // namespace content |
| OLD | NEW |