diff options
| author | oshima <oshima@chromium.org> | 2015-07-27 14:16:01 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-27 21:17:19 +0000 |
| commit | 81d33285d0e1dd675048c5648b8f552d9655ee51 (patch) | |
| tree | ee20964bc2b8382a865016ff88d078d255210ea4 /ash/test/ash_test_helper.cc | |
| parent | 7db270d16be6f08f9cb2b71508204c770bdbc3c6 (diff) | |
| download | chromium_src-81d33285d0e1dd675048c5648b8f552d9655ee51.zip chromium_src-81d33285d0e1dd675048c5648b8f552d9655ee51.tar.gz chromium_src-81d33285d0e1dd675048c5648b8f552d9655ee51.tar.bz2 | |
[Cleanup]: Made SetDisplayUIScale private
I'll consolidate this and SetDisplayUIMode in next CL.
other cleanups:
* Moved
GetDisplayModeForResolution/GetDisplayModeForNextUIScale out from DisplayManager as utility function, as they do not depend on DisplayManager.
* Removed argument from DisplayManagerTestApi. It's always
Shell::GetInstance()->display_manager().
BUG=None
TBR=asargent@chromium.org
Review URL: https://codereview.chromium.org/1254733002
Cr-Commit-Position: refs/heads/master@{#340564}
Diffstat (limited to 'ash/test/ash_test_helper.cc')
| -rw-r--r-- | ash/test/ash_test_helper.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index 60b8f3e..60a3a31 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc @@ -102,8 +102,7 @@ void AshTestHelper::SetUp(bool start_session) { GetTestSessionStateDelegate()->SetHasActiveUser(true); } - test::DisplayManagerTestApi(shell->display_manager()). - DisableChangeDisplayUponHostResize(); + test::DisplayManagerTestApi().DisableChangeDisplayUponHostResize(); ShellTestApi(shell).DisableDisplayConfiguratorAnimation(); test_screenshot_delegate_ = new TestScreenshotDelegate(); |