summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/import_settings_dialog.mm
diff options
context:
space:
mode:
authormirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-22 16:42:07 +0000
committermirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-22 16:42:07 +0000
commit80a9966966b76bba436398ca529f9e4d509d5aab (patch)
tree11aec759e5dde6a0ae4b9262c557c90205e27690 /chrome/browser/cocoa/import_settings_dialog.mm
parenta37bd9baafb3ccc1532b77db9df922d35a10e2f3 (diff)
downloadchromium_src-80a9966966b76bba436398ca529f9e4d509d5aab.zip
chromium_src-80a9966966b76bba436398ca529f9e4d509d5aab.tar.gz
chromium_src-80a9966966b76bba436398ca529f9e4d509d5aab.tar.bz2
Move importer data types into a separate file to prepare for moving importer
into its own process. BUG= 18774 TEST= none Review URL: http://codereview.chromium.org/1110005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/import_settings_dialog.mm')
-rw-r--r--chrome/browser/cocoa/import_settings_dialog.mm25
1 files changed, 14 insertions, 11 deletions
diff --git a/chrome/browser/cocoa/import_settings_dialog.mm b/chrome/browser/cocoa/import_settings_dialog.mm
index 454e8cc..09985c5 100644
--- a/chrome/browser/cocoa/import_settings_dialog.mm
+++ b/chrome/browser/cocoa/import_settings_dialog.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
@@ -6,6 +6,7 @@
#include "base/mac_util.h"
#include "base/sys_string_conversions.h"
+#include "chrome/browser/importer/importer_data_types.h"
#include "chrome/browser/importer/importer_list.h"
#include "chrome/browser/profile.h"
@@ -120,7 +121,7 @@ bool importSettingsDialogVisible = false;
NSMutableArray* browserProfiles =
[NSMutableArray arrayWithCapacity:profilesCount];
for (int i = 0; i < profilesCount; ++i) {
- const ProfileInfo& sourceProfile = importerList.GetSourceProfileInfoAt(i);
+ const importer::ProfileInfo& sourceProfile = importerList.GetSourceProfileInfoAt(i);
NSString* browserName =
base::SysWideToNSString(sourceProfile.description);
uint16 browserServices = sourceProfile.services_supported;
@@ -169,7 +170,7 @@ bool importSettingsDialogVisible = false;
- (IBAction)ok:(id)sender {
[self closeDialog];
- const ProfileInfo& sourceProfile =
+ const importer::ProfileInfo& sourceProfile =
importerList_.get()->GetSourceProfileInfoAt([self sourceBrowserIndex]);
uint16 items = sourceProfile.services_supported;
// ProfileInfo.services_supported is a uint16 while the call to
@@ -213,22 +214,24 @@ bool importSettingsDialogVisible = false;
ImportSettingsProfile* profile =
[sourceBrowsersList_.get() objectAtIndex:browserIndex];
uint16 items = [profile services];
- [self setHistoryAvailable:(items & HISTORY) ? YES : NO];
+ [self setHistoryAvailable:(items & importer::HISTORY) ? YES : NO];
[self setImportHistory:[self historyAvailable]];
- [self setFavoritesAvailable:(items & FAVORITES) ? YES : NO];
+ [self setFavoritesAvailable:(items & importer::FAVORITES) ? YES : NO];
[self setImportFavorites:[self favoritesAvailable]];
- [self setPasswordsAvailable:(items & PASSWORDS) ? YES : NO];
+ [self setPasswordsAvailable:(items & importer::PASSWORDS) ? YES : NO];
[self setImportPasswords:[self passwordsAvailable]];
- [self setSearchEnginesAvailable:(items & SEARCH_ENGINES) ? YES : NO];
+ [self setSearchEnginesAvailable:(items & importer::SEARCH_ENGINES) ?
+ YES : NO];
[self setImportSearchEngines:[self searchEnginesAvailable]];
}
- (uint16)servicesToImport {
uint16 servicesToImport = 0;
- if ([self importHistory]) servicesToImport |= HISTORY;
- if ([self importFavorites]) servicesToImport |= FAVORITES;
- if ([self importPasswords]) servicesToImport |= PASSWORDS;
- if ([self importSearchEngines]) servicesToImport |= SEARCH_ENGINES;
+ if ([self importHistory]) servicesToImport |= importer::HISTORY;
+ if ([self importFavorites]) servicesToImport |= importer::FAVORITES;
+ if ([self importPasswords]) servicesToImport |= importer::PASSWORDS;
+ if ([self importSearchEngines]) servicesToImport |=
+ importer::SEARCH_ENGINES;
return servicesToImport;
}