Update dialog parent handling logic.

chrome/browser/chromeos/options/options_window_view.cc

Index: chrome/browser/chromeos/options/options_window_view.cc
diff --git a/chrome/browser/chromeos/options/options_window_view.cc b/chrome/browser/chromeos/options/options_window_view.cc
index c072787941f12c169b23a2a567f16ce5935b4918..d284ce342a6016cfe62220cc848f6546f808c4f8 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(),

[sky, 2010/06/02 17:44:12]

FindBrowserWithType searches in order of activation, so you can just use it
instead of first asking for GetLastActive.

[xiyuan, 2010/06/02 17:48:08]

The reason for doing this is FindBrowserWithType expects a profile and I don't
have that. :(

[sky, 2010/06/02 17:52:22]

Ah ok. That makes sense.

+                                           Browser::TYPE_NORMAL,
+                                           true);
+    }
+
+    if (b)
+      return b->window()->GetNativeHandle();
+  }
 
   return NULL;
 }