Fix call ordering in Carbon plugin interposing

SetSystemUIMode seems to be unhappy with releasing full screen mode while a full-screen plugin window is still frontmont; swap the order of our calls so we do them after the window is closed instead.

BUG=25838
TEST=Open a full-screen Flash window, then exit. Dock should re-appear.

Review URL: http://codereview.chromium.org/342026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30393 0039d316-1c4b-4281-b951-d872f2087c98
parent 18cbf31c
...@@ -111,17 +111,19 @@ static void ChromePluginShowWindow(WindowRef window) { ...@@ -111,17 +111,19 @@ static void ChromePluginShowWindow(WindowRef window) {
} }
static void ChromePluginDisposeWindow(WindowRef window) { static void ChromePluginDisposeWindow(WindowRef window) {
MaybeReactivateSavedProcess(); CGWindowID window_id = HIWindowGetCGWindowID(window);
webkit_glue::NotifyBrowserOfPluginDisposeWindow(HIWindowGetCGWindowID(window), CGRect window_rect = CGRectForWindow(window);
CGRectForWindow(window));
DisposeWindow(window); DisposeWindow(window);
webkit_glue::NotifyBrowserOfPluginDisposeWindow(window_id, window_rect);
MaybeReactivateSavedProcess();
} }
static void ChromePluginHideWindow(WindowRef window) { static void ChromePluginHideWindow(WindowRef window) {
MaybeReactivateSavedProcess(); CGWindowID window_id = HIWindowGetCGWindowID(window);
webkit_glue::NotifyBrowserOfPluginHideWindow(HIWindowGetCGWindowID(window), CGRect window_rect = CGRectForWindow(window);
CGRectForWindow(window));
HideWindow(window); HideWindow(window);
webkit_glue::NotifyBrowserOfPluginHideWindow(window_id, window_rect);
MaybeReactivateSavedProcess();
} }
#pragma mark - #pragma mark -
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment