| Index: chrome/common/crash_keys.cc
|
| diff --git a/chrome/common/crash_keys.cc b/chrome/common/crash_keys.cc
|
| index bfc80ff357d608baed44eb94f2642398dd7d7a81..baf6abe20e9d66e603bae661de4cbb9ab7b140d1 100644
|
| --- a/chrome/common/crash_keys.cc
|
| +++ b/chrome/common/crash_keys.cc
|
| @@ -16,6 +16,7 @@
|
| #include "chrome/common/chrome_switches.h"
|
| #include "components/flags_ui/flags_ui_switches.h"
|
| #include "content/public/common/content_switches.h"
|
| +#include "gpu/config/gpu_crash_keys.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| #include "chrome/common/chrome_switches.h"
|
| @@ -35,20 +36,6 @@ const char kNumExtensionsCount[] = "num-extensions";
|
| const char kShutdownType[] = "shutdown-type";
|
| const char kBrowserUnpinTrace[] = "browser-unpin-trace";
|
|
|
| -#if !defined(OS_ANDROID)
|
| -const char kGPUVendorID[] = "gpu-venid";
|
| -const char kGPUDeviceID[] = "gpu-devid";
|
| -#endif
|
| -const char kGPUDriverVersion[] = "gpu-driver";
|
| -const char kGPUPixelShaderVersion[] = "gpu-psver";
|
| -const char kGPUVertexShaderVersion[] = "gpu-vsver";
|
| -#if defined(OS_MACOSX)
|
| -const char kGPUGLVersion[] = "gpu-glver";
|
| -#elif defined(OS_POSIX)
|
| -const char kGPUVendor[] = "gpu-gl-vendor";
|
| -const char kGPURenderer[] = "gpu-gl-renderer";
|
| -#endif
|
| -
|
| #if defined(OS_WIN)
|
| const char kHungRendererOutstandingAckCount[] = "hung-outstanding-acks";
|
| const char kHungRendererOutstandingEventType[] = "hung-outstanding-event-type";
|
| @@ -119,17 +106,17 @@ size_t RegisterChromeCrashKeys() {
|
| {kShutdownType, kSmallSize},
|
| {kBrowserUnpinTrace, kMediumSize},
|
| #if !defined(OS_ANDROID)
|
| - {kGPUVendorID, kSmallSize},
|
| - {kGPUDeviceID, kSmallSize},
|
| + {gpu::crash_keys::kGPUVendorID, kSmallSize},
|
| + {gpu::crash_keys::kGPUDeviceID, kSmallSize},
|
| #endif
|
| - {kGPUDriverVersion, kSmallSize},
|
| - {kGPUPixelShaderVersion, kSmallSize},
|
| - {kGPUVertexShaderVersion, kSmallSize},
|
| + {gpu::crash_keys::kGPUDriverVersion, kSmallSize},
|
| + {gpu::crash_keys::kGPUPixelShaderVersion, kSmallSize},
|
| + {gpu::crash_keys::kGPUVertexShaderVersion, kSmallSize},
|
| #if defined(OS_MACOSX)
|
| - {kGPUGLVersion, kSmallSize},
|
| + {gpu::crash_keys::kGPUGLVersion, kSmallSize},
|
| #elif defined(OS_POSIX)
|
| - {kGPUVendor, kSmallSize},
|
| - {kGPURenderer, kSmallSize},
|
| + {gpu::crash_keys::kGPUVendor, kSmallSize},
|
| + {gpu::crash_keys::kGPURenderer, kSmallSize},
|
| #endif
|
|
|
| // content/:
|
|
|