2 files changed, 12 insertions, 3 deletions
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index 7be7cd0..a4987f2 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -401,7 +401,8 @@ ImporterHost::ImporterHost()
       file_loop_(g_browser_process->file_thread()->message_loop()),
       waiting_for_bookmarkbar_model_(false),
       is_source_readable_(true),
-      headless_(false) {
+      headless_(false),
+      parent_window_(NULL) {
   DetectSourceProfiles();
 }
 
@@ -412,7 +413,8 @@ ImporterHost::ImporterHost(MessageLoop* file_loop)
       file_loop_(file_loop),
       waiting_for_bookmarkbar_model_(false),
       is_source_readable_(true),
-      headless_(false) {
+      headless_(false),
+      parent_window_(NULL) {
   DetectSourceProfiles();
 }
 
@@ -449,7 +451,7 @@ void ImporterHost::ShowWarningDialog() {
     views::Window::CreateChromeWindow(GetActiveWindow(), gfx::Rect(),
                                       new ImporterLockView(this))->Show();
 #elif defined(OS_LINUX)
-    ImportLockDialogGtk::Show(NULL, this);
+    ImportLockDialogGtk::Show(parent_window_, this);
 #else
     // TODO(port): Need CreateChromeWindow.
     NOTIMPLEMENTED();
diff --git a/chrome/browser/importer/importer.h b/chrome/browser/importer/importer.h
index c7360fd..93ed19b 100644
--- a/chrome/browser/importer/importer.h
+++ b/chrome/browser/importer/importer.h
@@ -223,6 +223,10 @@ class ImporterHost : public base::RefCounted<ImporterHost>,
     return headless_;
   }
 
+  void set_parent_window(gfx::NativeWindow parent_window) {
+    parent_window_ = parent_window;
+  }
+
   // An interface which an object can implement to be notified of events during
   // the import process.
   class Observer {
@@ -310,6 +314,9 @@ class ImporterHost : public base::RefCounted<ImporterHost>,
   // True if UI is not to be shown.
   bool headless_;
 
+  // Parent Window to use when showing any modal dialog boxes.
+  gfx::NativeWindow parent_window_;
+
   // Firefox profile lock.
   scoped_ptr<FirefoxProfileLock> firefox_lock_;