Revert of Added capability on Windows to get the physical dimensions of your attached monitors. Also added th…

content/browser/gpu/gpu_internals_ui.cc

 // Copyright (c) 2012 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 "content/browser/gpu/gpu_internals_ui.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 24 matching lines @@
 #include "gpu/config/gpu_feature_type.h"
 #include "gpu/config/gpu_info.h"
 #include "third_party/angle/src/common/version.h"
 #include "ui/gl/gpu_switching_manager.h"
 
 #if defined(OS_LINUX) && defined(USE_X11)
 #include <X11/Xlib.h>
 #endif
 #if defined(OS_WIN)
 #include "ui/base/win/shell.h"
-#include "ui/gfx/win/physical_size.h"
 #endif
 
 #if defined(OS_LINUX) && defined(USE_X11)
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/x/x11_atom_cache.h"
 #endif
 
 namespace content {
 namespace {
 
@@ skipping 86 matching lines @@
   }
 #if defined(OS_WIN)
   std::string compositor =
       ui::win::IsAeroGlassEnabled() ? "Aero Glass" : "none";
   basic_info->Append(
       NewDescriptionValuePair("Desktop compositing", compositor));
   if (GpuDataManagerImpl::GetInstance()->ShouldUseWarp()) {
     basic_info->Append(NewDescriptionValuePair("Using WARP",
         new base::FundamentalValue(true)));
   }
-
-  std::vector<gfx::PhysicalDisplaySize> display_sizes =
-      gfx::GetPhysicalSizeForDisplays();
-  for (const auto& display_size : display_sizes) {
-    const int w = display_size.width_mm;
-    const int h = display_size.height_mm;
-    const double size_mm = sqrt(w * w + h * h);
-    const double size_inches = 0.0393701 * size_mm;
-    const double rounded_size_inches = floor(10.0 * size_inches) / 10.0;
-    std::string size_string = base::StringPrintf("%.1f\"", rounded_size_inches);
-    std::string description_string = base::StringPrintf(
-        "Diagonal Monitor Size of %s", display_size.display_name.c_str());
-    basic_info->Append(
-        NewDescriptionValuePair(description_string, size_string));
-  }
 #endif
 
   std::string disabled_extensions;
   GpuDataManagerImpl::GetInstance()->GetDisabledExtensions(
       &disabled_extensions);
 
   basic_info->Append(
       NewDescriptionValuePair("Driver vendor", gpu_info.driver_vendor));
   basic_info->Append(NewDescriptionValuePair("Driver version",
                                              gpu_info.driver_version));
@@ skipping 362 matching lines @@
     : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new GpuMessageHandler());
 
   // Set up the chrome://gpu/ source.
   BrowserContext* browser_context =
       web_ui->GetWebContents()->GetBrowserContext();
   WebUIDataSource::Add(browser_context, CreateGpuHTMLSource());
 }
 
 }  // namespace content