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

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

Issue 79033002: Disable win/ash on high dpi screens (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Move win8 specific logic into driver. Created 7 years, 1 month 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 | ui/gfx/win/dpi.h » ('j') | 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 eea6eaa85690193c45b3cf06570f8b51d699822f..5715f4c97efdf478b649fcabdb8543104a584f2c 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -65,6 +65,7 @@
#include "chrome/browser/enumerate_modules_model_win.h"
#include "chrome/browser/ui/metro_pin_tab_helper_win.h"
#include "content/public/browser/gpu_data_manager.h"
+#include "ui/gfx/win/dpi.h"
#include "win8/util/win8_util.h"
#endif
@@ -544,7 +545,10 @@ void WrenchMenuModel::Build(bool is_new_menu) {
#if defined(USE_AURA)
if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
- content::GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor()) {
+ content::GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor() &&
+ gfx::win::GetUndocumentedDPIScale() == 1.0f &&
+ gfx::GetDPIScale() == 1.0 &&
+ gfx::GetModernUIScale() == 1.0f) {
if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) {
// Metro mode, add the 'Relaunch Chrome in desktop mode'.
AddSeparator(ui::NORMAL_SEPARATOR);
« no previous file with comments | « no previous file | ui/gfx/win/dpi.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698