summaryrefslogtreecommitdiffstats
path: root/content/browser/gpu/gpu_internals_ui.cc
diff options
context:
space:
mode:
authorjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-07 12:56:53 +0000
committerjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-07 12:56:53 +0000
commita39b8c30182e9f6b975650a095712c943cca293a (patch)
treeaac26d4155007486334b3b345983b760da82d418 /content/browser/gpu/gpu_internals_ui.cc
parent3d67c1a6870bed5b39df649e7fcd159bec162fe1 (diff)
downloadchromium_src-a39b8c30182e9f6b975650a095712c943cca293a.zip
chromium_src-a39b8c30182e9f6b975650a095712c943cca293a.tar.gz
chromium_src-a39b8c30182e9f6b975650a095712c943cca293a.tar.bz2
Display whether aero glass is being used in about:gpu.
With Aura we've discovered cases where having aero glass enabled or not can cause bugs, so display that information in about:gpu. BUG= Review URL: https://codereview.chromium.org/124313003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243283 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu/gpu_internals_ui.cc')
-rw-r--r--content/browser/gpu/gpu_internals_ui.cc15
1 files changed, 13 insertions, 2 deletions
diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc
index d58b6ff..6b8c678 100644
--- a/content/browser/gpu/gpu_internals_ui.cc
+++ b/content/browser/gpu/gpu_internals_ui.cc
@@ -30,6 +30,10 @@
#include "grit/content_resources.h"
#include "third_party/angle/src/common/version.h"
+#if defined(OS_WIN)
+#include "ui/base/win/shell.h"
+#endif
+
namespace content {
namespace {
@@ -118,8 +122,15 @@ base::DictionaryValue* GpuInfoAsDictionaryValue() {
basic_info->Append(NewDescriptionValuePair(
"DisplayLink Version", gpu_info.display_link_version.GetString()));
}
- basic_info->Append(NewDescriptionValuePair("Driver vendor",
- gpu_info.driver_vendor));
+#if defined(OS_WIN)
+ std::string compositor =
+ ui::win::IsAeroGlassEnabled() ? "Aero Glass" : "none";
+ basic_info->Append(
+ NewDescriptionValuePair("Desktop compositing", compositor));
+#endif
+
+ basic_info->Append(
+ NewDescriptionValuePair("Driver vendor", gpu_info.driver_vendor));
basic_info->Append(NewDescriptionValuePair("Driver version",
gpu_info.driver_version));
basic_info->Append(NewDescriptionValuePair("Driver date",