summaryrefslogtreecommitdiffstats
path: root/chrome/browser/importer
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/importer')
-rw-r--r--chrome/browser/importer/firefox_importer_utils.cc8
-rw-r--r--chrome/browser/importer/ie_importer.cc2
-rw-r--r--chrome/browser/importer/importer.cc4
-rw-r--r--chrome/browser/importer/importer_unittest.cc2
4 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/importer/firefox_importer_utils.cc b/chrome/browser/importer/firefox_importer_utils.cc
index c595659..1003b90 100644
--- a/chrome/browser/importer/firefox_importer_utils.cc
+++ b/chrome/browser/importer/firefox_importer_utils.cc
@@ -8,8 +8,10 @@
#if defined(OS_WIN)
#include <shlobj.h>
-#endif
+#include "app/win_util.h"
+#include "base/registry.h"
+#endif
#include "base/file_util.h"
#include "base/logging.h"
#include "base/string_util.h"
@@ -20,10 +22,6 @@
#include "googleurl/src/gurl.h"
#include "net/base/base64.h"
-#if defined(OS_WIN)
-#include "base/registry.h"
-#include "chrome/common/win_util.h"
-#endif
namespace {
diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc
index dde6c19..fe27b12 100644
--- a/chrome/browser/importer/ie_importer.cc
+++ b/chrome/browser/importer/ie_importer.cc
@@ -13,6 +13,7 @@
#include <algorithm>
#include "app/l10n_util.h"
+#include "app/win_util.h"
#include "base/file_util.h"
#include "base/registry.h"
#include "base/string_util.h"
@@ -23,7 +24,6 @@
#include "chrome/browser/search_engines/template_url_model.h"
#include "chrome/common/time_format.h"
#include "chrome/common/url_constants.h"
-#include "chrome/common/win_util.h"
#include "googleurl/src/gurl.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index c97e9e1..66aa8ed 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -9,6 +9,9 @@
#include "app/gfx/favicon_size.h"
#include "app/l10n_util.h"
+#if defined(OS_WIN)
+#include "app/win_util.h"
+#endif
#include "base/file_util.h"
#include "base/gfx/png_encoder.h"
#include "base/string_util.h"
@@ -39,7 +42,6 @@
// TODO(port): Port these files.
#if defined(OS_WIN)
#include "chrome/browser/views/importer_lock_view.h"
-#include "chrome/common/win_util.h"
#include "views/window/window.h"
#endif
diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc
index 01b75cd..ebe23c8 100644
--- a/chrome/browser/importer/importer_unittest.cc
+++ b/chrome/browser/importer/importer_unittest.cc
@@ -13,6 +13,7 @@
#include <shlguid.h>
#include <vector>
+#include "app/win_util.h"
#include "base/file_util.h"
#include "base/path_service.h"
#include "chrome/browser/importer/ie_importer.h"
@@ -20,7 +21,6 @@
#include "chrome/browser/password_manager/ie7_password.h"
#include "chrome/browser/profile.h"
#include "chrome/common/chrome_paths.h"
-#include "chrome/common/win_util.h"
class ImporterTest : public testing::Test {
public: