Update dialog parent handling logic.

- Use real transient parent for hosted native dialogs since window manager
  supports transient of transient now;
- Use last active normal browser window as parent for option dialogs since
  we don't want to use panel popups as parent;

BUG=chromium-os:3708
TEST=none. This CL gives real transent parent for dialogs but we still need to way to show the dialogs, either exit fullscreen or put them on top of fullscreen.

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

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

1 files changed, 10 insertions, 2 deletions

diff --git a/chrome/browser/chromeos/options/options_window_view.cc b/chrome/browser/chromeos/options/options_window_view.cc
index c072787..d284ce3 100644
--- a/chrome/browser/chromeos/options/options_window_view.cc
+++ b/chrome/browser/chromeos/options/options_window_view.cc
@@ -307,8 +307,16 @@ void CloseOptionsWindow() {
 }
 
 gfx::NativeWindow GetOptionsViewParent() {
-  if (Browser* b = BrowserList::GetLastActive())
-    return b->window()->GetNativeHandle();
+  if (Browser* b = BrowserList::GetLastActive()) {
+    if (b->type() != Browser::TYPE_NORMAL) {
+      b = BrowserList::FindBrowserWithType(b->profile(),
+                                           Browser::TYPE_NORMAL,
+                                           true);
+    }
+
+    if (b)
+      return b->window()->GetNativeHandle();
+  }
 
   return NULL;
 }