Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1942)

Unified Diff: chrome/browser/cocoa/import_settings_dialog.mm

Issue 4282003: Fix type inconsistency with StartImportingWithUI and ProfileInfo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/cocoa/import_progress_dialog.mm ('k') | chrome/browser/first_run/first_run_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/import_settings_dialog.mm
diff --git a/chrome/browser/cocoa/import_settings_dialog.mm b/chrome/browser/cocoa/import_settings_dialog.mm
index a11244aef56d15dbeafb2497ce960d86ba9a9a53..d18dec8995d8ff0ad85204f1e79dd581c5d6fca9 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;
« no previous file with comments | « chrome/browser/cocoa/import_progress_dialog.mm ('k') | chrome/browser/first_run/first_run_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698