diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/cocoa/import_progress_dialog.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/import_settings_dialog.mm | 4 | ||||
| -rw-r--r-- | chrome/browser/first_run/first_run_win.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/gtk/import_progress_dialog_gtk.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/importer/importer.h | 2 | ||||
| -rw-r--r-- | chrome/browser/views/importing_progress_view.cc | 2 |
6 files changed, 6 insertions, 8 deletions
diff --git a/chrome/browser/cocoa/import_progress_dialog.mm b/chrome/browser/cocoa/import_progress_dialog.mm index 109365b..f40ae5f 100644 --- a/chrome/browser/cocoa/import_progress_dialog.mm +++ b/chrome/browser/cocoa/import_progress_dialog.mm @@ -154,7 +154,7 @@ NSString* keyForImportItem(importer::ImportItem item) { @end void StartImportingWithUI(gfx::NativeWindow parent_window, - int16 items, + uint16 items, ImporterHost* coordinator, const importer::ProfileInfo& source_profile, Profile* target_profile, 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; diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index a7f7a3c..35037d5 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -561,7 +561,7 @@ int FirstRun::ImportFromBrowser(Profile* profile, StartImportingWithUI( parent_window, - items_to_import, + static_cast<uint16>(items_to_import), importer_host, importer_host->GetSourceProfileInfoForBrowserType(browser_type), profile, diff --git a/chrome/browser/gtk/import_progress_dialog_gtk.cc b/chrome/browser/gtk/import_progress_dialog_gtk.cc index b405b13..c70561b 100644 --- a/chrome/browser/gtk/import_progress_dialog_gtk.cc +++ b/chrome/browser/gtk/import_progress_dialog_gtk.cc @@ -216,7 +216,7 @@ void ImportProgressDialogGtk::ShowDialog() { void StartImportingWithUI(GtkWindow* parent, - int16 items, + uint16 items, ImporterHost* importer_host, const ProfileInfo& browser_profile, Profile* profile, diff --git a/chrome/browser/importer/importer.h b/chrome/browser/importer/importer.h index 4887138..2f034ba 100644 --- a/chrome/browser/importer/importer.h +++ b/chrome/browser/importer/importer.h @@ -514,7 +514,7 @@ class ImportObserver { // if there's nothing to parent to. first_run is true if it's invoked in the // first run UI. void StartImportingWithUI(gfx::NativeWindow parent_window, - int16 items, + uint16 items, ImporterHost* coordinator, const importer::ProfileInfo& source_profile, Profile* target_profile, diff --git a/chrome/browser/views/importing_progress_view.cc b/chrome/browser/views/importing_progress_view.cc index f3c2627..ae3135e 100644 --- a/chrome/browser/views/importing_progress_view.cc +++ b/chrome/browser/views/importing_progress_view.cc @@ -290,7 +290,7 @@ void ImportingProgressView::InitControlLayout() { // StartImportingWithUI void StartImportingWithUI(HWND parent_window, - int16 items, + uint16 items, ImporterHost* coordinator, const ProfileInfo& source_profile, Profile* target_profile, |