importer: Eliminate the dependency on browser/ui/ from importer.

BUG=None
TEST=None

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

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

7 files changed, 35 insertions, 18 deletions

diff --git a/chrome/browser/importer/importer_host.cc b/chrome/browser/importer/importer_host.cc
index 948bbbf..07445eb 100644
--- a/chrome/browser/importer/importer_host.cc
+++ b/chrome/browser/importer/importer_host.cc
@@ -10,11 +10,11 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/importer/firefox_profile_lock.h"
 #include "chrome/browser/importer/importer_bridge.h"
+#include "chrome/browser/importer/importer_lock_dialog.h"
 #include "chrome/browser/importer/importer_progress_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/browser/ui/browser_dialogs.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_source.h"
 #include "grit/generated_resources.h"
@@ -43,7 +43,7 @@ void ImporterHost::ShowWarningDialog() {
   if (headless_) {
     OnImportLockDialogEnd(false);
   } else {
-    browser::ShowImportLockDialog(parent_window_, this);
+    importer::ShowImportLockDialog(parent_window_, this);
   }
 }
 
diff --git a/chrome/browser/importer/importer_lock_dialog.h b/chrome/browser/importer/importer_lock_dialog.h
new file mode 100644
index 0000000..6005363
--- /dev/null
+++ b/chrome/browser/importer/importer_lock_dialog.h
@@ -0,0 +1,23 @@
+// Copyright (c) 2011 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.
+
+#ifndef CHROME_BROWSER_IMPORTER_IMPORTER_LOCK_DIALOG_H_
+#define CHROME_BROWSER_IMPORTER_IMPORTER_LOCK_DIALOG_H_
+#pragma once
+
+#include "ui/gfx/native_widget_types.h"
+
+class ImporterHost;
+
+namespace importer {
+
+// This function is called by an ImporterHost, and presents the Firefox profile
+// warning dialog. After closing the dialog, the ImportHost receives a callback
+// with the message either to skip the import, or to continue the process.
+void ShowImportLockDialog(gfx::NativeWindow parent,
+                          ImporterHost* importer_host);
+
+}  // namespace importer
+
+#endif  // CHROME_BROWSER_IMPORTER_IMPORTER_LOCK_DIALOG_H_
diff --git a/chrome/browser/ui/browser_dialogs.h b/chrome/browser/ui/browser_dialogs.h
index 4ee597b..1981941 100644
--- a/chrome/browser/ui/browser_dialogs.h
+++ b/chrome/browser/ui/browser_dialogs.h
@@ -11,7 +11,6 @@
 
 class Browser;
 class Extension;
-class ImporterHost;
 class HtmlDialogUIDelegate;
 class Profile;
 class SkBitmap;
@@ -37,13 +36,6 @@ void ShowAboutIPCDialog();
 gfx::NativeWindow ShowHtmlDialog(gfx::NativeWindow parent, Profile* profile,
                                  HtmlDialogUIDelegate* delegate);
 
-// This function is called by an ImporterHost, and displays the Firefox profile
-// locked warning by creating a dialog.  On the closing of the dialog, the
-// ImportHost receives a callback with the message either to skip the import,
-// or to try again.
-void ShowImportLockDialog(gfx::NativeWindow parent,
-                          ImporterHost* importer_host);
-
 // Creates the ExtensionInstalledBubble and schedules it to be shown once
 // the extension has loaded. |extension| is the installed extension. |browser|
 // is the browser window which will host the bubble. |icon| is the install
diff --git a/chrome/browser/ui/cocoa/importer/import_lock_dialog_cocoa.mm b/chrome/browser/ui/cocoa/importer/import_lock_dialog_cocoa.mm
index 6dfa694..1a3697d 100644
--- a/chrome/browser/ui/cocoa/importer/import_lock_dialog_cocoa.mm
+++ b/chrome/browser/ui/cocoa/importer/import_lock_dialog_cocoa.mm
@@ -7,12 +7,12 @@
 #include "base/message_loop.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/importer/importer_host.h"
-#include "chrome/browser/ui/browser_dialogs.h"
+#include "chrome/browser/importer/importer_lock_dialog.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
-namespace browser {
+namespace importer {
 
 void ShowImportLockDialog(gfx::NativeWindow parent,
                           ImporterHost* importer_host) {
@@ -35,4 +35,4 @@ void ShowImportLockDialog(gfx::NativeWindow parent,
   }
 }
 
-}  // namespace browser
+}  // namespace importer
diff --git a/chrome/browser/ui/gtk/importer/import_lock_dialog_gtk.cc b/chrome/browser/ui/gtk/importer/import_lock_dialog_gtk.cc
index b71e245..b47f013 100644
--- a/chrome/browser/ui/gtk/importer/import_lock_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/importer/import_lock_dialog_gtk.cc
@@ -8,20 +8,20 @@
 
 #include "base/message_loop.h"
 #include "chrome/browser/importer/importer_host.h"
-#include "chrome/browser/ui/browser_dialogs.h"
+#include "chrome/browser/importer/importer_lock_dialog.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-namespace browser {
+namespace importer {
 
 void ShowImportLockDialog(gfx::NativeWindow parent,
                           ImporterHost* importer_host) {
   ImportLockDialogGtk::Show(parent, importer_host);
 }
 
-}  // namespace browser
+}  // namespace importer
 
 // static
 void ImportLockDialogGtk::Show(GtkWindow* parent, ImporterHost* importer_host) {
diff --git a/chrome/browser/ui/views/importer/import_lock_dialog_view.cc b/chrome/browser/ui/views/importer/import_lock_dialog_view.cc
index beedffb..c2da72d 100644
--- a/chrome/browser/ui/views/importer/import_lock_dialog_view.cc
+++ b/chrome/browser/ui/views/importer/import_lock_dialog_view.cc
@@ -7,6 +7,7 @@
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/importer/importer_host.h"
+#include "chrome/browser/importer/importer_lock_dialog.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
@@ -19,14 +20,14 @@
 static const int kDefaultWindowWidth = 320;
 static const int kDefaultWindowHeight = 100;
 
-namespace browser {
+namespace importer {
 
 void ShowImportLockDialog(gfx::NativeWindow parent,
                           ImporterHost* importer_host) {
   ImportLockDialogView::Show(parent, importer_host);
 }
 
-}  // namespace browser
+}  // namespace importer
 
 // static
 void ImportLockDialogView::Show(gfx::NativeWindow parent,
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index ce0bf8f..dc76390 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1219,6 +1219,7 @@
         'browser/importer/importer_host.h',
         'browser/importer/importer_list.cc',
         'browser/importer/importer_list.h',
+        'browser/importer/importer_lock_dialog.h',
         'browser/importer/importer_messages.cc',
         'browser/importer/importer_messages.h',
         'browser/importer/importer_messages_internal.h',