Update dialog parent handling logic.

chrome/browser/chromeos/options/options_window_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/options_window.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 289 matching lines @@
     return NULL;
   }
 }
 
 void CloseOptionsWindow() {
   if (OptionsWindowView::instance_)
     OptionsWindowView::instance_->window()->Close();
 }
 
 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;
 }
 
 };  // namespace chromeos
 
 ///////////////////////////////////////////////////////////////////////////////
 // Factory/finder method:
 
 void ShowOptionsWindow(OptionsPage page,
                        OptionsGroup highlight_group,
                        Profile* profile) {
   DCHECK(profile);
 
   using chromeos::OptionsWindowView;
 
   // If there's already an existing options window, close it and create
   // a new one for the current active browser.
   chromeos::CloseOptionsWindow();
 
   OptionsWindowView::instance_ = new OptionsWindowView(profile);
   views::Window::CreateChromeWindow(chromeos::GetOptionsViewParent(),
                                     gfx::Rect(),
                                     OptionsWindowView::instance_);
 
   OptionsWindowView::instance_->ShowOptionsPage(page, highlight_group);
 }