diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-13 11:12:45 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-13 11:12:45 +0000 |
| commit | 81ac72c6f3aa2b3fc2a0206b5ac320cf4be1e84d (patch) | |
| tree | 73d173df5d4277cf9be1c518f3fcca98447394e0 /ash/display | |
| parent | 6f2da1c9be1aba4e5879d2de1529b2627c7dbbbe (diff) | |
| download | chromium_src-81ac72c6f3aa2b3fc2a0206b5ac320cf4be1e84d.zip chromium_src-81ac72c6f3aa2b3fc2a0206b5ac320cf4be1e84d.tar.gz chromium_src-81ac72c6f3aa2b3fc2a0206b5ac320cf4be1e84d.tar.bz2 | |
Fix for out-of-sync scale factor issue
- Set active root window early when creating browsers on startup.
- Send screen info when device scale factor chagned.
- gfx::Screen::GetDisplayNearestWindow should return Primary when the window's root doesn't exist. I missed this condition in https://chromiumcodereview.appspot.com/10961021
BUG=155201, 152728
TEST=manual: see bug for repro steps
Review URL: https://chromiumcodereview.appspot.com/11066130
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
| -rw-r--r-- | ash/display/multi_display_manager.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ash/display/multi_display_manager.cc b/ash/display/multi_display_manager.cc index 5cb7cfd..aba85f0 100644 --- a/ash/display/multi_display_manager.cc +++ b/ash/display/multi_display_manager.cc @@ -307,7 +307,9 @@ const gfx::Display& MultiDisplayManager::GetDisplayNearestWindow( return DisplayController::GetPrimaryDisplay(); const RootWindow* root = window->GetRootWindow(); MultiDisplayManager* manager = const_cast<MultiDisplayManager*>(this); - return root ? manager->FindDisplayForRootWindow(root) : GetInvalidDisplay(); + return root ? + manager->FindDisplayForRootWindow(root) : + DisplayController::GetPrimaryDisplay(); } const gfx::Display& MultiDisplayManager::GetDisplayNearestPoint( |