diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-20 12:51:01 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-20 12:51:01 +0000 |
| commit | ce9202eb0da3a2d96e2774afefdb15ce29ee184e (patch) | |
| tree | 073746c7abb737439990306da4c10bc0603b6f6b /chrome/browser/cocoa/import_settings_dialog.mm | |
| parent | e93a142812151925aeeb66e7ce7ee297f04bc2e8 (diff) | |
| download | chromium_src-ce9202eb0da3a2d96e2774afefdb15ce29ee184e.zip chromium_src-ce9202eb0da3a2d96e2774afefdb15ce29ee184e.tar.gz chromium_src-ce9202eb0da3a2d96e2774afefdb15ce29ee184e.tar.bz2 | |
Revert r35069
Review URL: http://codereview.chromium.org/509002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35070 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/import_settings_dialog.mm')
| -rw-r--r-- | chrome/browser/cocoa/import_settings_dialog.mm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/import_settings_dialog.mm b/chrome/browser/cocoa/import_settings_dialog.mm index 245856b..7d8babe 100644 --- a/chrome/browser/cocoa/import_settings_dialog.mm +++ b/chrome/browser/cocoa/import_settings_dialog.mm @@ -13,6 +13,7 @@ @property(assign, readwrite, nonatomic) BOOL historyAvailable; @property(assign, readwrite, nonatomic) BOOL favoritesAvailable; +@property(assign, readwrite, nonatomic) BOOL cookiesAvailable; @property(assign, readwrite, nonatomic) BOOL passwordsAvailable; @property(assign, readwrite, nonatomic) BOOL searchEnginesAvailable; @@ -63,17 +64,19 @@ @synthesize sourceBrowserIndex = sourceBrowserIndex_; @synthesize importHistory = importHistory_; @synthesize importFavorites = importFavorites_; +@synthesize importCookies = importCookies_; @synthesize importPasswords = importPasswords_; @synthesize importSearchEngines = importSearchEngines_; @synthesize historyAvailable = historyAvailable_; @synthesize favoritesAvailable = favoritesAvailable_; +@synthesize cookiesAvailable = cookiesAvailable_; @synthesize passwordsAvailable = passwordsAvailable_; @synthesize searchEnginesAvailable = searchEnginesAvailable_; // Set bindings dependencies for importSomething property. + (NSSet*)keyPathsForValuesAffectingImportSomething { return [NSSet setWithObjects:@"importHistory", @"importFavorites", - @"importPasswords", @"importSearchEngines", nil]; + @"importCookies", @"importPasswords", @"importSearchEngines", nil]; } - (id)initWithProfile:(Profile*)profile @@ -199,6 +202,8 @@ [self setImportHistory:[self historyAvailable]]; [self setFavoritesAvailable:(items & FAVORITES) ? YES : NO]; [self setImportFavorites:[self favoritesAvailable]]; + [self setCookiesAvailable:(items & COOKIES) ? YES : NO]; + [self setImportCookies:[self cookiesAvailable]]; [self setPasswordsAvailable:(items & PASSWORDS) ? YES : NO]; [self setImportPasswords:[self passwordsAvailable]]; [self setSearchEnginesAvailable:(items & SEARCH_ENGINES) ? YES : NO]; @@ -209,6 +214,7 @@ uint16 servicesToImport = 0; if ([self importHistory]) servicesToImport |= HISTORY; if ([self importFavorites]) servicesToImport |= FAVORITES; + if ([self importCookies]) servicesToImport |= COOKIES; if ([self importPasswords]) servicesToImport |= PASSWORDS; if ([self importSearchEngines]) servicesToImport |= SEARCH_ENGINES; return servicesToImport; @@ -219,7 +225,8 @@ // and bound to the OK button's enable property. - (BOOL)importSomething { return [self importHistory] || [self importFavorites] || - [self importPasswords] || [self importSearchEngines]; + [self importCookies] || [self importPasswords] || + [self importSearchEngines]; } @end |