Fix a crash when a plugin file picker window is dismissed. This is a

spot fix--a comprehensive fix will require
http://code.google.com/p/chromium/issues/detail?id=23571
BUG=23774
TEST=upload a file via Flash (example: Gmail, YouTube).  The browser should not crash
after you click "OK" to dismiss the file picker.
Review URL: http://codereview.chromium.org/242161

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28158 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 3 deletions

diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc
index 142315d..573e0a9 100644
--- a/chrome/browser/plugin_process_host.cc
+++ b/chrome/browser/plugin_process_host.cc
@@ -330,10 +330,15 @@ PluginProcessHost::~PluginProcessHost() {
   }
 #elif defined(OS_MACOSX)
   // If the plugin process crashed but had windows open at the time, make
-  // sure that the menu bar is visible if the browser window is not also in
-  // fullscreen mode.
+  // sure that the menu bar is visible.
+  // TODO: only do this if the browser window is not also in fullscreen mode.
+  // (see http://code.google.com/p/chromium/issues/detail?id=23571)
   if (!plugin_visible_windows_set_.empty()) {
-    SetSystemUIMode(kUIModeNormal, 0);
+    SystemUIMode mode;
+    SystemUIOptions options;
+    GetSystemUIMode(&mode, &options);
+    if (mode != kUIModeNormal)
+      SetSystemUIMode(kUIModeNormal, 0);
   }
 #endif
 }