Use real creator code for Keychain items

chrome/browser/importer/importer.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/importer/importer.h"
 
 #include <map>
 #include <set>
 
 #include "app/gfx/favicon_size.h"
 #include "app/l10n_util.h"
-#if defined(OS_WIN)
-#include "app/win_util.h"
-#endif
 #include "base/file_util.h"
 #include "base/gfx/png_encoder.h"
-#include "base/mac_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/importer/firefox2_importer.h"
 #include "chrome/browser/importer/firefox3_importer.h"
 #include "chrome/browser/importer/firefox_importer_utils.h"
 #include "chrome/browser/importer/firefox_profile_lock.h"
-#if defined(OS_WIN)
-#include "chrome/browser/importer/ie_importer.h"
-#endif
-#if defined(OS_MACOSX)
-#include "chrome/browser/importer/safari_importer.h"
-#endif
 #include "chrome/browser/importer/toolbar_importer.h"
-#if defined(OS_WIN)
-#include "chrome/browser/password_manager/ie7_password.h"
-#endif
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/image_operations.h"
 #include "webkit/glue/image_decoder.h"
 #include "webkit/glue/password_form.h"
 
 // TODO(port): Port these files.
 #if defined(OS_WIN)
 #include "chrome/browser/views/importer_lock_view.h"
 #include "views/window/window.h"
 #elif defined(OS_LINUX)
 #include "chrome/browser/gtk/import_lock_dialog_gtk.h"
 #endif
 
+#if defined(OS_WIN)
+#include "app/win_util.h"
+#include "chrome/browser/importer/ie_importer.h"
+#include "chrome/browser/password_manager/ie7_password.h"
+#endif
+#if defined(OS_MACOSX)
+#include "base/mac_util.h"
+#include "chrome/browser/importer/safari_importer.h"
+#endif
+
 using webkit_glue::PasswordForm;
 
 // ProfileWriter.
 
 bool ProfileWriter::BookmarkModelIsLoaded() const {
   return profile_->GetBookmarkModel()->IsLoaded();
 }
 
 bool ProfileWriter::TemplateURLModelIsLoaded() const {
   return profile_->GetTemplateURLModel()->loaded();
@@ skipping 756 matching lines @@
   ProfileInfo* safari = new ProfileInfo();
   safari->browser_type = SAFARI;
   safari->description = l10n_util::GetString(IDS_IMPORT_FROM_SAFARI);
   safari->source_path.clear();
   safari->app_path.clear();
   safari->services_supported = HISTORY | FAVORITES | COOKIES | PASSWORDS |
       SEARCH_ENGINES;
   source_profiles_.push_back(safari);
 }
 #endif  // OS_MACOSX