MD Settings: Hook up import data dialog.

chrome/browser/ui/webui/settings/settings_import_data_handler.cc

 // Copyright 2016 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/settings/settings_import_data_handler.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/importer/external_process_importer_host.h"
 #include "chrome/browser/importer/importer_list.h"
 #include "chrome/browser/importer/importer_uma.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_ui.h"
 
 using content::BrowserThread;
 
 namespace settings {
 
 namespace {
@@ skipping 65 matching lines @@
                                       imported_items,
                                       new ProfileWriter(profile));
 
   importer::LogImporterUseToMetrics("ImportDataHandler",
                                     source_profile.importer_type);
 }
 
 void ImportDataHandler::ImportData(const base::ListValue* args) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  std::string string_value;
+  int browser_index;
+  CHECK(args->GetInteger(0, &browser_index));
 
-  int browser_index;
-  if (!args->GetString(0, &string_value) ||
-      !base::StringToInt(string_value, &browser_index)) {
-    NOTREACHED();
-    return;
-  }
+  PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
 
   uint16_t selected_items = importer::NONE;
-  if (args->GetString(1, &string_value) && string_value == "true") {
+  if (prefs->GetBoolean(prefs::kImportAutofillFormData))
+    selected_items |= importer::AUTOFILL_FORM_DATA;
+  if (prefs->GetBoolean(prefs::kImportBookmarks))
+    selected_items |= importer::FAVORITES;
+  if (prefs->GetBoolean(prefs::kImportHistory))
     selected_items |= importer::HISTORY;
-  }
-  if (args->GetString(2, &string_value) && string_value == "true") {
-    selected_items |= importer::FAVORITES;
-  }
-  if (args->GetString(3, &string_value) && string_value == "true") {
+  if (prefs->GetBoolean(prefs::kImportSavedPasswords))
     selected_items |= importer::PASSWORDS;
-  }
-  if (args->GetString(4, &string_value) && string_value == "true") {
+  if (prefs->GetBoolean(prefs::kImportSearchEngine))

[tommycli, 2016/11/16 17:23:53]

^ nice...

[dpapad, 2016/11/16 21:33:02]

Thanks!

     selected_items |= importer::SEARCH_ENGINES;
-  }
-  if (args->GetString(5, &string_value) && string_value == "true") {
-    selected_items |= importer::AUTOFILL_FORM_DATA;
-  }
 
   const importer::SourceProfile& source_profile =
       importer_list_->GetSourceProfileAt(browser_index);
   uint16_t supported_items = source_profile.services_supported;
 
   uint16_t imported_items = (selected_items & supported_items);
   if (imported_items) {
     StartImport(source_profile, imported_items);
   } else {
     LOG(WARNING) << "There were no settings to import from '"
@@ skipping 107 matching lines @@
                                   base::string16(),
                                   base::FilePath(),
                                   &file_type_info,
                                   0,
                                   base::FilePath::StringType(),
                                   browser->window()->GetNativeWindow(),
                                   NULL);
 }
 
 }  // namespace settings