Drop an obsolete Keychain disclaimer in the import dialog.

chrome/browser/ui/webui/options/import_data_handler.cc

 // Copyright (c) 2012 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/ui/webui/options/import_data_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 50 matching lines @@
     {"importHistory", IDS_IMPORT_HISTORY_CHKBOX},
     {"importFavorites", IDS_IMPORT_FAVORITES_CHKBOX},
     {"importSearch", IDS_IMPORT_SEARCH_ENGINES_CHKBOX},
     {"importPasswords", IDS_IMPORT_PASSWORDS_CHKBOX},
     {"importAutofillFormData", IDS_IMPORT_AUTOFILL_FORM_DATA_CHKBOX},
     {"importChooseFile", IDS_IMPORT_CHOOSE_FILE},
     {"importCommit", IDS_IMPORT_COMMIT},
     {"noProfileFound", IDS_IMPORT_NO_PROFILE_FOUND},
     {"importSucceeded", IDS_IMPORT_SUCCEEDED},
     {"findYourImportedBookmarks", IDS_IMPORT_FIND_YOUR_BOOKMARKS},
-#if defined(OS_MACOSX)
-    {"macPasswordKeychain", IDS_IMPORT_PASSWORD_KEYCHAIN_WARNING},
-#endif
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
   RegisterTitle(localized_strings, "importDataOverlay",
                 IDS_IMPORT_SETTINGS_TITLE);
 }
 
 void ImportDataHandler::InitializeHandler() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
@@ skipping 102 matching lines @@
         (browser_services & importer::HISTORY) != 0);
     browser_profile->SetBoolean("favorites",
         (browser_services & importer::FAVORITES) != 0);
     browser_profile->SetBoolean("passwords",
         (browser_services & importer::PASSWORDS) != 0);
     browser_profile->SetBoolean("search",
         (browser_services & importer::SEARCH_ENGINES) != 0);
     browser_profile->SetBoolean("autofill-form-data",
         (browser_services & importer::AUTOFILL_FORM_DATA) != 0);
 
-    browser_profile->SetBoolean("show_bottom_bar",
-#if defined(OS_MACOSX)
-        source_profile.importer_type == importer::TYPE_SAFARI);
-#else
-        false);
-#endif
-
     browser_profiles.Append(browser_profile);
   }
 
   web_ui()->CallJavascriptFunction("ImportDataOverlay.updateSupportedBrowsers",
                                    browser_profiles);
 }
 
 void ImportDataHandler::ImportStarted() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
@@ skipping 57 matching lines @@
                                   base::string16(),
                                   base::FilePath(),
                                   &file_type_info,
                                   0,
                                   base::FilePath::StringType(),
                                   browser->window()->GetNativeWindow(),
                                   NULL);
 }
 
 }  // namespace options