diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-22 21:13:31 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-22 21:13:31 +0000 |
| commit | 8b2447ecbe6d9816975fd2978a439332cd3a78cb (patch) | |
| tree | 81e901ec326c1fcecd6c38636848d5bf102972d1 /ash/test | |
| parent | 7c6942232d73e06fa7e6cc94bc9e4017710ffe79 (diff) | |
| download | chromium_src-8b2447ecbe6d9816975fd2978a439332cd3a78cb.zip chromium_src-8b2447ecbe6d9816975fd2978a439332cd3a78cb.tar.gz chromium_src-8b2447ecbe6d9816975fd2978a439332cd3a78cb.tar.bz2 | |
- Store rotation/ui scale to local state.
- Reset the overscan to the default value if the display has overscan.
- Move overscan data into kDisplayProperties dictionary value.
- Remove Rotate/Scale shortcut from login screen as we can't store the state in login screen.
BUG=196818
TEST=covered by unit test.
Review URL: https://codereview.chromium.org/12505005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189910 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/display_manager_test_api.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/test/display_manager_test_api.cc b/ash/test/display_manager_test_api.cc index f4e2930..f057765 100644 --- a/ash/test/display_manager_test_api.cc +++ b/ash/test/display_manager_test_api.cc @@ -85,7 +85,7 @@ int64 DisplayManagerTestApi::SetFirstDisplayAsInternalDisplay() { const gfx::Display& internal = display_manager_->displays_[0]; gfx::Display::SetInternalDisplayId(internal.id()); display_manager_->internal_display_info_.reset(new DisplayInfo( - display_manager_->GetDisplayInfo(internal))); + display_manager_->GetDisplayInfo(internal.id()))); return gfx::Display::InternalDisplayId(); } |