Makes popups persist across all workspaces.

BUG=124088
TEST=none
R=ben@chromium.org

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

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

chrome/browser/ui/views/frame/browser_frame_aura.cc

@@ -78,9 +78,11 @@ BrowserFrameAura::BrowserFrameAura(BrowserFrame* browser_frame,
   GetNativeWindow()->SetName("BrowserFrameAura");
   GetNativeWindow()->AddObserver(window_property_watcher_.get());
 #if defined(USE_ASH)
-  ash::SetPersistsAcrossAllWorkspaces(
-      GetNativeWindow(),
-      ash::WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_NO);
+  if (browser_view->browser()->type() != Browser::TYPE_POPUP) {
+    ash::SetPersistsAcrossAllWorkspaces(
+        GetNativeWindow(),
+        ash::WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_NO);
+  }
 #endif
 }