Collect DirectX diagnostic information asynchronously....

chrome/gpu/gpu_info_collector_win.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/gpu/gpu_info_collector.h"
 
 #include <windows.h>
 #include <d3d9.h>
 
 #include "app/gfx/gl/gl_context_egl.h"
@@ skipping 19 matching lines @@
     return false;
 
   IDirect3DDevice9* device = display->getDevice();
   if (!device)
     return false;
 
   IDirect3D9* d3d = NULL;
   if (FAILED(device->GetDirect3D(&d3d)))
     return false;
 
-  // Don't fail if DirectX diagnostics are not available. Just leave the tree
-  // empty. The other GPU info is still valuable.
-  DxDiagNode dx_diagnostics;
-  if (GetDxDiagnostics(&dx_diagnostics))
-    gpu_info->SetDxDiagnostics(dx_diagnostics);
+  if (!CollectGraphicsInfoD3D(d3d, gpu_info))
+    return false;
 
-  return CollectGraphicsInfoD3D(d3d, gpu_info);
+  // DirectX diagnostics are collected asynchronously because it takes a
+  // couple of seconds. Do not mark as complete until that is done.
+  gpu_info->SetProgress(GPUInfo::kPartial);
+
+  return true;
 }
 
 bool CollectGraphicsInfoD3D(IDirect3D9* d3d, GPUInfo* gpu_info) {
   DCHECK(d3d);
   DCHECK(gpu_info);
 
   // Get device information
   D3DADAPTER_IDENTIFIER9 identifier;
   HRESULT hr = d3d->GetAdapterIdentifier(D3DADAPTER_DEFAULT, 0, &identifier);
   if (hr != D3D_OK) {
@@ skipping 76 matching lines @@
                             pixel_shader_version,
                             vertex_shader_version,
                             0,  // GL version of 0 indicates D3D
                             false);
   return true;
 
   // TODO(rlp): Add driver and pixel versions
 }
 
 }  // namespace gpu_info_collector