Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3380)

Unified Diff: chrome/browser/ui/toolbar/wrench_menu_model.cc

Issue 692863003: Disable Win7 ASH mode in Release builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/toolbar/wrench_menu_model.cc
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index 907b472182156981c1a566f5fb0c406a033680e1..c29f71ddcd0fdcbe62bddc869590cd48ed7c4458 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -556,9 +556,14 @@ void WrenchMenuModel::Build() {
}
#if defined(OS_WIN)
+ base::win::Version min_version_for_ash_mode = base::win::VERSION_WIN8;
+ // Windows 7 ASH mode is only supported in DEBUG for now.
+#if !defined(NDEBUG)
+ min_version_for_ash_mode = base::win::VERSION_WIN7;
+#endif
// Windows 8 can support ASH mode using WARP, but Windows 7 requires a working
// GPU compositor.
- if ((base::win::GetVersion() >= base::win::VERSION_WIN7 &&
+ if ((base::win::GetVersion() >= min_version_for_ash_mode &&
content::GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor()) ||
(base::win::GetVersion() >= base::win::VERSION_WIN8)) {
if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698