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

1 files changed, 8 insertions, 6 deletions

diff --git a/chrome/browser/plugin_carbon_interpose_mac.cc b/chrome/browser/plugin_carbon_interpose_mac.cc
index a7beff7..e9a4997 100644
--- a/chrome/browser/plugin_carbon_interpose_mac.cc
+++ b/chrome/browser/plugin_carbon_interpose_mac.cc
@@ -111,17 +111,19 @@ static void ChromePluginShowWindow(WindowRef window) {
 }
 
 static void ChromePluginDisposeWindow(WindowRef window) {
-  MaybeReactivateSavedProcess();
-  webkit_glue::NotifyBrowserOfPluginDisposeWindow(HIWindowGetCGWindowID(window),
-                                                  CGRectForWindow(window));
+  CGWindowID window_id = HIWindowGetCGWindowID(window);
+  CGRect window_rect = CGRectForWindow(window);
   DisposeWindow(window);
+  webkit_glue::NotifyBrowserOfPluginDisposeWindow(window_id, window_rect);
+  MaybeReactivateSavedProcess();
 }
 
 static void ChromePluginHideWindow(WindowRef window) {
-  MaybeReactivateSavedProcess();
-  webkit_glue::NotifyBrowserOfPluginHideWindow(HIWindowGetCGWindowID(window),
-                                               CGRectForWindow(window));
+  CGWindowID window_id = HIWindowGetCGWindowID(window);
+  CGRect window_rect = CGRectForWindow(window);
   HideWindow(window);
+  webkit_glue::NotifyBrowserOfPluginHideWindow(window_id, window_rect);
+  MaybeReactivateSavedProcess();
 }
 
 #pragma mark -