| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "chrome/browser/ui/cocoa/import_settings_dialog.h" | 5 #import "chrome/browser/ui/cocoa/import_settings_dialog.h" |
| 6 | 6 |
| 7 #include "base/mac_util.h" | 7 #include "base/mac/mac_util.h" |
| 8 #include "base/sys_string_conversions.h" | 8 #include "base/sys_string_conversions.h" |
| 9 #include "chrome/browser/importer/importer_data_types.h" | 9 #include "chrome/browser/importer/importer_data_types.h" |
| 10 #include "chrome/browser/importer/importer_list.h" | 10 #include "chrome/browser/importer/importer_list.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 12 | 12 |
| 13 namespace { | 13 namespace { |
| 14 | 14 |
| 15 bool importSettingsDialogVisible = false; | 15 bool importSettingsDialogVisible = false; |
| 16 | 16 |
| 17 } // namespace | 17 } // namespace |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 [browserProfiles addObject:settingsProfile]; | 133 [browserProfiles addObject:settingsProfile]; |
| 134 } | 134 } |
| 135 if ((self = [self initWithProfiles:browserProfiles])) { | 135 if ((self = [self initWithProfiles:browserProfiles])) { |
| 136 profile_ = profile; | 136 profile_ = profile; |
| 137 } | 137 } |
| 138 return self; | 138 return self; |
| 139 } | 139 } |
| 140 | 140 |
| 141 - (id)initWithProfiles:(NSArray*)profiles { | 141 - (id)initWithProfiles:(NSArray*)profiles { |
| 142 NSString* nibpath = | 142 NSString* nibpath = |
| 143 [mac_util::MainAppBundle() pathForResource:@"ImportSettingsDialog" | 143 [base::mac::MainAppBundle() pathForResource:@"ImportSettingsDialog" |
| 144 ofType:@"nib"]; | 144 ofType:@"nib"]; |
| 145 if ((self = [super initWithWindowNibPath:nibpath owner:self])) { | 145 if ((self = [super initWithWindowNibPath:nibpath owner:self])) { |
| 146 sourceBrowsersList_.reset([profiles retain]); | 146 sourceBrowsersList_.reset([profiles retain]); |
| 147 // Create and initialize an importerList_ when running unit tests. | 147 // Create and initialize an importerList_ when running unit tests. |
| 148 if (!importerList_.get()) { | 148 if (!importerList_.get()) { |
| 149 importerList_ = new ImporterList; | 149 importerList_ = new ImporterList; |
| 150 ImporterList& importerList(*(importerList_.get())); | 150 ImporterList& importerList(*(importerList_.get())); |
| 151 importerList.DetectSourceProfilesHack(); | 151 importerList.DetectSourceProfilesHack(); |
| 152 } | 152 } |
| 153 } | 153 } |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 | 236 |
| 237 // KVO accessor which returns YES if at least one of the services | 237 // KVO accessor which returns YES if at least one of the services |
| 238 // provided by the selected profile has been marked for importing | 238 // provided by the selected profile has been marked for importing |
| 239 // and bound to the OK button's enable property. | 239 // and bound to the OK button's enable property. |
| 240 - (BOOL)importSomething { | 240 - (BOOL)importSomething { |
| 241 return [self importHistory] || [self importFavorites] || | 241 return [self importHistory] || [self importFavorites] || |
| 242 [self importPasswords] || [self importSearchEngines]; | 242 [self importPasswords] || [self importSearchEngines]; |
| 243 } | 243 } |
| 244 | 244 |
| 245 @end | 245 @end |
| OLD | NEW |