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

Unified Diff: chrome/browser/dom_ui/options/import_data_handler.cc

Issue 5606008: DOMUI: Clean up importer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years 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 | « no previous file | chrome/browser/resources/options/import_data_overlay.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_ui/options/import_data_handler.cc
diff --git a/chrome/browser/dom_ui/options/import_data_handler.cc b/chrome/browser/dom_ui/options/import_data_handler.cc
index f11f9b1344316ae9f5a090d05f5b5984a0fb8da0..0b092e0ec54986f17ccf2c2439e85e4491e22d61 100644
--- a/chrome/browser/dom_ui/options/import_data_handler.cc
+++ b/chrome/browser/dom_ui/options/import_data_handler.cc
@@ -31,23 +31,23 @@ ImportDataHandler::~ImportDataHandler() {
void ImportDataHandler::GetLocalizedValues(
DictionaryValue* localized_strings) {
DCHECK(localized_strings);
- localized_strings->SetString("import_data_title",
+ localized_strings->SetString("importDataTitle",
l10n_util::GetStringUTF16(IDS_IMPORT_SETTINGS_TITLE));
- localized_strings->SetString("import_from_label",
+ localized_strings->SetString("importFromLabel",
l10n_util::GetStringUTF16(IDS_IMPORT_FROM_LABEL));
- localized_strings->SetString("import_commit",
- l10n_util::GetStringUTF16(IDS_IMPORT_COMMIT));
- localized_strings->SetString("import_description",
+ localized_strings->SetString("importDescription",
l10n_util::GetStringUTF16(IDS_IMPORT_ITEMS_LABEL));
- localized_strings->SetString("import_favorites",
+ localized_strings->SetString("importHistory",
+ l10n_util::GetStringUTF16(IDS_IMPORT_HISTORY_CHKBOX));
+ localized_strings->SetString("importFavorites",
l10n_util::GetStringUTF16(IDS_IMPORT_FAVORITES_CHKBOX));
- localized_strings->SetString("import_search",
+ localized_strings->SetString("importSearch",
l10n_util::GetStringUTF16(IDS_IMPORT_SEARCH_ENGINES_CHKBOX));
- localized_strings->SetString("import_passwords",
+ localized_strings->SetString("importPasswords",
l10n_util::GetStringUTF16(IDS_IMPORT_PASSWORDS_CHKBOX));
- localized_strings->SetString("import_history",
- l10n_util::GetStringUTF16(IDS_IMPORT_HISTORY_CHKBOX));
- localized_strings->SetString("no_profile_found",
+ localized_strings->SetString("importCommit",
+ l10n_util::GetStringUTF16(IDS_IMPORT_COMMIT));
+ localized_strings->SetString("noProfileFound",
l10n_util::GetStringUTF16(IDS_IMPORT_NO_PROFILE_FOUND));
}
@@ -57,7 +57,7 @@ void ImportDataHandler::Initialize() {
// The ImporterHost object creates an ImporterList, which calls PathExists
// one or more times. Because we are currently in the UI thread, this will
// trigger a DCHECK due to IO being done on the UI thread. For now we will
- // supress the DCHECK. See the following bug for more detail:
+ // suppress the DCHECK. See the following bug for more detail:
// http://crbug.com/60825
base::ThreadRestrictions::ScopedAllowIO allow_io;
importer_list_->DetectSourceProfiles();
« no previous file with comments | « no previous file | chrome/browser/resources/options/import_data_overlay.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698