summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authormirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-19 16:42:13 +0000
committermirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-19 16:42:13 +0000
commite57b0db08bc0f73d4f42f485ea1ed9070969c18f (patch)
tree10a3187bae462c9d2926c85e828303ce76f79f4b /chrome/browser/cocoa
parentd9c320a8f7ff01a475a831924797001f54443a85 (diff)
downloadchromium_src-e57b0db08bc0f73d4f42f485ea1ed9070969c18f.zip
chromium_src-e57b0db08bc0f73d4f42f485ea1ed9070969c18f.tar.gz
chromium_src-e57b0db08bc0f73d4f42f485ea1ed9070969c18f.tar.bz2
Move data types used in the importer process to common/, in preparation for import to run out of process.
BUG= 18774 TEST= none. Review URL: http://codereview.chromium.org/2106015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/import_progress_dialog.h2
-rw-r--r--chrome/browser/cocoa/import_settings_dialog.mm5
2 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/cocoa/import_progress_dialog.h b/chrome/browser/cocoa/import_progress_dialog.h
index 41e401d..85c08c7 100644
--- a/chrome/browser/cocoa/import_progress_dialog.h
+++ b/chrome/browser/cocoa/import_progress_dialog.h
@@ -8,7 +8,7 @@
#import <Cocoa/Cocoa.h>
#include "chrome/browser/importer/importer.h"
-#include "chrome/browser/importer/importer_data_types.h"
+#include "chrome/common/importer_data_types.h"
class ImporterObserverBridge;
diff --git a/chrome/browser/cocoa/import_settings_dialog.mm b/chrome/browser/cocoa/import_settings_dialog.mm
index 09985c5..2020113 100644
--- a/chrome/browser/cocoa/import_settings_dialog.mm
+++ b/chrome/browser/cocoa/import_settings_dialog.mm
@@ -6,7 +6,7 @@
#include "base/mac_util.h"
#include "base/sys_string_conversions.h"
-#include "chrome/browser/importer/importer_data_types.h"
+#include "chrome/common/importer_data_types.h"
#include "chrome/browser/importer/importer_list.h"
#include "chrome/browser/profile.h"
@@ -121,7 +121,8 @@ bool importSettingsDialogVisible = false;
NSMutableArray* browserProfiles =
[NSMutableArray arrayWithCapacity:profilesCount];
for (int i = 0; i < profilesCount; ++i) {
- const importer::ProfileInfo& sourceProfile = importerList.GetSourceProfileInfoAt(i);
+ const importer::ProfileInfo& sourceProfile =
+ importerList.GetSourceProfileInfoAt(i);
NSString* browserName =
base::SysWideToNSString(sourceProfile.description);
uint16 browserServices = sourceProfile.services_supported;