diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/cocoa/import_settings_dialog.mm | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/cocoa/import_settings_dialog.mm')
| -rw-r--r-- | chrome/browser/cocoa/import_settings_dialog.mm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/cocoa/import_settings_dialog.mm b/chrome/browser/cocoa/import_settings_dialog.mm index a11244a..d18dec8 100644 --- a/chrome/browser/cocoa/import_settings_dialog.mm +++ b/chrome/browser/cocoa/import_settings_dialog.mm @@ -174,9 +174,7 @@ bool importSettingsDialogVisible = false; const importer::ProfileInfo& sourceProfile = importerList_.get()->GetSourceProfileInfoAt([self sourceBrowserIndex]); uint16 items = sourceProfile.services_supported; - // ProfileInfo.services_supported is a uint16 while the call to - // StartImportingWithUI requires an int16. - int16 servicesToImport = static_cast<int16>(items & [self servicesToImport]); + uint16 servicesToImport = items & [self servicesToImport]; if (servicesToImport) { if (profile_) { ImporterHost* importerHost = new ExternalProcessImporterHost; |