diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 01:07:12 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 01:07:12 +0000 |
| commit | 7a9d82fe6d719faffd240b5dfaba47f39a532c2f (patch) | |
| tree | 2da4d118171bbaa3353f0cf0d85861a622d7ef4a /media | |
| parent | 7e9e510ade8d8c422f2103f933db5e7104e7975a (diff) | |
| download | chromium_src-7a9d82fe6d719faffd240b5dfaba47f39a532c2f.zip chromium_src-7a9d82fe6d719faffd240b5dfaba47f39a532c2f.tar.gz chromium_src-7a9d82fe6d719faffd240b5dfaba47f39a532c2f.tar.bz2 | |
Re-assert vote to disable Aero on switching desktops.
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
Diffstat (limited to 'media')
| -rw-r--r-- | media/video/capture/screen/screen_capturer_win.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/media/video/capture/screen/screen_capturer_win.cc b/media/video/capture/screen/screen_capturer_win.cc index 65fc654..e74e640 100644 --- a/media/video/capture/screen/screen_capturer_win.cc +++ b/media/video/capture/screen/screen_capturer_win.cc @@ -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. |