DOMUI: Clean up importer.

chrome/browser/dom_ui/options/import_data_handler.cc

 // Copyright (c) 2010 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/dom_ui/options/import_data_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/scoped_ptr.h"
@@ skipping 13 matching lines @@
 }
 
 ImportDataHandler::~ImportDataHandler() {
   if (importer_host_)
     importer_host_->SetObserver(NULL);
 }
 
 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",
+  localized_strings->SetString("importDescription",
+      l10n_util::GetStringUTF16(IDS_IMPORT_ITEMS_LABEL));
+  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("importSearch",
+      l10n_util::GetStringUTF16(IDS_IMPORT_SEARCH_ENGINES_CHKBOX));
+  localized_strings->SetString("importPasswords",
+      l10n_util::GetStringUTF16(IDS_IMPORT_PASSWORDS_CHKBOX));
+  localized_strings->SetString("importCommit",
       l10n_util::GetStringUTF16(IDS_IMPORT_COMMIT));
-  localized_strings->SetString("import_description",
-      l10n_util::GetStringUTF16(IDS_IMPORT_ITEMS_LABEL));
-  localized_strings->SetString("import_favorites",
-      l10n_util::GetStringUTF16(IDS_IMPORT_FAVORITES_CHKBOX));
-  localized_strings->SetString("import_search",
-      l10n_util::GetStringUTF16(IDS_IMPORT_SEARCH_ENGINES_CHKBOX));
-  localized_strings->SetString("import_passwords",
-      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("noProfileFound",
       l10n_util::GetStringUTF16(IDS_IMPORT_NO_PROFILE_FOUND));
 }
 
 void ImportDataHandler::Initialize() {
   importer_list_.reset(new ImporterList);
 
   // 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();
   int profiles_count = importer_list_->GetAvailableProfileCount();
 
   ListValue browser_profiles;
   if (profiles_count > 0) {
     for (int i = 0; i < profiles_count; i++) {
       const importer::ProfileInfo& source_profile =
           importer_list_->GetSourceProfileInfoAt(i);
@@ skipping 97 matching lines @@
 void ImportDataHandler::ImportItemEnded(importer::ImportItem item) {
   // TODO(csilv): show progress detail in the web view.
 }
 
 void ImportDataHandler::ImportEnded() {
   importer_host_->SetObserver(NULL);
   importer_host_ = NULL;
 
   dom_ui_->CallJavascriptFunction(L"ImportDataOverlay.dismiss");
 }