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

Unified Diff: chrome/browser/ui/webui/options/import_data_handler.cc

Issue 1290183002: Drop an obsolete Keychain disclaimer in the import dialog. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months 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/resources/options/import_data_overlay.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/import_data_handler.cc
diff --git a/chrome/browser/ui/webui/options/import_data_handler.cc b/chrome/browser/ui/webui/options/import_data_handler.cc
index c8682778e4d1fa08af4e9cd992fc3a8db63b5891..e0df00696398d4f2e8cd6d899cd957ccfd239f54 100644
--- a/chrome/browser/ui/webui/options/import_data_handler.cc
+++ b/chrome/browser/ui/webui/options/import_data_handler.cc
@@ -68,9 +68,6 @@ void ImportDataHandler::GetLocalizedValues(
{"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));
@@ -193,13 +190,6 @@ void ImportDataHandler::InitializePage() {
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);
}
« no previous file with comments | « chrome/browser/resources/options/import_data_overlay.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698