diff options
| author | Mitsuru Oshima <oshima@chromium.org> | 2014-09-29 18:41:26 -0700 |
|---|---|---|
| committer | Mitsuru Oshima <oshima@chromium.org> | 2014-09-30 01:42:03 +0000 |
| commit | 35e6e57ebb807eb83568b99a7042940dbd5cc703 (patch) | |
| tree | a904f09957d1ae0422509006deb09624758caa0f | |
| parent | 723bdadc601ced4516e896dca2a820973b118918 (diff) | |
| download | chromium_src-35e6e57ebb807eb83568b99a7042940dbd5cc703.zip chromium_src-35e6e57ebb807eb83568b99a7042940dbd5cc703.tar.gz chromium_src-35e6e57ebb807eb83568b99a7042940dbd5cc703.tar.bz2 | |
Enable 1.25dsf for ui scaling
BUG=413368
TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/575553005
Cr-Commit-Position: refs/heads/master@{#295375}
(cherry picked from commit c53ac4533755f05dd30393b1b948250825d3042f)
Review URL: https://codereview.chromium.org/613073002
Cr-Commit-Position: refs/branch-heads/2125@{#528}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
| -rw-r--r-- | ash/display/display_manager.cc | 4 | ||||
| -rw-r--r-- | ash/display/display_manager_unittest.cc | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc index e2e4b75..aa27741 100644 --- a/ash/display/display_manager.cc +++ b/ash/display/display_manager.cc @@ -164,6 +164,10 @@ DisplayManager::DisplayManager() second_display_mode_(EXTENDED), mirrored_display_id_(gfx::Display::kInvalidDisplayID) { #if defined(OS_CHROMEOS) + // Enable only on the device so that DisplayManagerFontTest passes. + if (base::SysInfo::IsRunningOnChromeOS()) + DisplayInfo::SetUse125DSFForUIScaling(true); + change_display_upon_host_resize_ = !base::SysInfo::IsRunningOnChromeOS(); #endif gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_ALTERNATE, diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc index 0b0fc09..36c75f9 100644 --- a/ash/display/display_manager_unittest.cc +++ b/ash/display/display_manager_unittest.cc @@ -6,6 +6,7 @@ #include "ash/ash_switches.h" #include "ash/display/display_controller.h" +#include "ash/display/display_info.h" #include "ash/display/display_layout_store.h" #include "ash/screen_util.h" #include "ash/shell.h" @@ -889,6 +890,8 @@ TEST_F(DisplayManagerTest, Rotate) { } TEST_F(DisplayManagerTest, UIScale) { + DisplayInfo::SetUse125DSFForUIScaling(false); + UpdateDisplay("1280x800"); int64 display_id = Shell::GetScreen()->GetPrimaryDisplay().id(); display_manager()->SetDisplayUIScale(display_id, 1.125f); |