Skip to content

Commit

Permalink
Re-assert vote to disable Aero on switching desktops.
Browse files Browse the repository at this point in the history
This is required to ensure that the Desktop Window Manager is not
enabled when switching from the logon desktop to the default one.

BUG=129906


Review URL: https://chromiumcodereview.appspot.com/12221104

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181803 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
wez@chromium.org committed Feb 12, 2013
1 parent 7e9e510 commit 7a9d82f
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions media/video/capture/screen/screen_capturer_win.cc
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,12 @@ void ScreenCapturerWin::PrepareCaptureResources() {
// If SetThreadDesktop() fails, the thread is still assigned a desktop.
// So we can continue capture screen bits, just from the wrong desktop.
desktop_.SetThreadDesktop(input_desktop.Pass());

// Re-assert our vote to disable Aero.
// See crbug.com/124018 and crbug.com/129906.
if (composition_func_ != NULL) {
(*composition_func_)(DWM_EC_DISABLECOMPOSITION);
}
}

// If the display bounds have changed then recreate GDI resources.
Expand Down

0 comments on commit 7a9d82f

Please sign in to comment.