MD Settings: Add an Import Data BrowserProxy.

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>
@@ skipping 17 matching lines @@
 #include "chrome/browser/ui/chrome_select_file_policy.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 {
+const char kImportStatusInProgress[] = "inProgress";
+const char kImportStatusSucceeded[] = "succeeded";
+const char kImportStatusFailed[] = "failed";
+}
+
 ImportDataHandler::ImportDataHandler()
     : importer_host_(NULL), import_did_succeed_(false) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
 ImportDataHandler::~ImportDataHandler() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (importer_host_)
     importer_host_->set_observer(NULL);
 
   if (select_file_dialog_.get())
     select_file_dialog_->ListenerDestroyed();
 }
 
-void ImportDataHandler::InitializeDialog(const base::ListValue* args) {
-  AllowJavascript();
-
-  importer_list_.reset(new ImporterList());
-  importer_list_->DetectSourceProfiles(
-      g_browser_process->GetApplicationLocale(),
-      true,  // include_interactive_profiles?
-      base::Bind(&ImportDataHandler::SendBrowserProfileData,
-                 base::Unretained(this)));
-}
-
 void ImportDataHandler::RegisterMessages() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   web_ui()->RegisterMessageCallback(
       "initializeImportDialog",
       base::Bind(&ImportDataHandler::InitializeDialog, base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "importData",
       base::Bind(&ImportDataHandler::ImportData, base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
-      "chooseBookmarksFile",
+      "importFromBookmarksFile",
       base::Bind(&ImportDataHandler::HandleChooseBookmarksFile,
                  base::Unretained(this)));
 }
 
 void ImportDataHandler::OnJavascriptDisallowed() {
   // Cancels outstanding profile list detections.
   importer_list_.reset();
 
   // Stops listening to updates from any ongoing imports.
   if (importer_host_)
     importer_host_->set_observer(NULL);
 }
 
 void ImportDataHandler::StartImport(
     const importer::SourceProfile& source_profile,
     uint16_t imported_items) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!imported_items)
     return;
 
   // If another import is already ongoing, let it finish silently.
   if (importer_host_)
     importer_host_->set_observer(NULL);
 
-  base::FundamentalValue importing(true);
-  web_ui()->CallJavascriptFunctionUnsafe("ImportDataOverlay.setImportingState",
-                                         importing);
+  CallJavascriptFunction("cr.webUIListenerCallback",
+                         base::StringValue("import-data-status-changed"),
+                         base::StringValue(kImportStatusInProgress));
   import_did_succeed_ = false;
 
   importer_host_ = new ExternalProcessImporterHost();
   importer_host_->set_observer(this);
   Profile* profile = Profile::FromWebUI(web_ui());
   importer_host_->StartImportSettings(source_profile, profile,
                                       imported_items,
                                       new ProfileWriter(profile));
 
   importer::LogImporterUseToMetrics("ImportDataHandler",
@@ skipping 35 matching lines @@
 
   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 '"
         << source_profile.importer_name << "'.";
   }
 }
 
-void ImportDataHandler::SendBrowserProfileData() {
+void ImportDataHandler::InitializeDialog(const base::ListValue* args) {
+  AllowJavascript();
+
+  CHECK_EQ(1U, args->GetSize());
+  std::string callback_id;
+  CHECK(args->GetString(0, &callback_id));
+
+  importer_list_.reset(new ImporterList());
+  importer_list_->DetectSourceProfiles(
+      g_browser_process->GetApplicationLocale(),
+      true,  // include_interactive_profiles?

[dpapad, 2016/11/03 23:40:43]

Maybe remove question mark at the end. Makes it sound like a TODO.

[tommycli, 2016/11/03 23:46:45]

Done.

+      base::Bind(&ImportDataHandler::SendBrowserProfileData,
+                 base::Unretained(this), callback_id));
+}
+
+void ImportDataHandler::SendBrowserProfileData(const std::string& callback_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   base::ListValue browser_profiles;
   for (size_t i = 0; i < importer_list_->count(); ++i) {
     const importer::SourceProfile& source_profile =
         importer_list_->GetSourceProfileAt(i);
     uint16_t browser_services = source_profile.services_supported;
 
     std::unique_ptr<base::DictionaryValue> browser_profile(
         new base::DictionaryValue());
     browser_profile->SetString("name", source_profile.importer_name);
     browser_profile->SetInteger("index", i);
     browser_profile->SetBoolean("history",
         (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_profile->SetBoolean(
+        "autofillFormData",
         (browser_services & importer::AUTOFILL_FORM_DATA) != 0);
 
     browser_profiles.Append(std::move(browser_profile));
   }
 
-  web_ui()->CallJavascriptFunctionUnsafe(
-      "ImportDataOverlay.updateSupportedBrowsers", browser_profiles);
+  ResolveJavascriptCallback(base::StringValue(callback_id), browser_profiles);
 }
 
 void ImportDataHandler::ImportStarted() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
 void ImportDataHandler::ImportItemStarted(importer::ImportItem item) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // TODO(csilv): show progress detail in the web view.
 }
 
 void ImportDataHandler::ImportItemEnded(importer::ImportItem item) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // TODO(csilv): show progress detail in the web view.
   import_did_succeed_ = true;
 }
 
 void ImportDataHandler::ImportEnded() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   importer_host_->set_observer(NULL);
   importer_host_ = NULL;
 
-  if (import_did_succeed_) {
-    web_ui()->CallJavascriptFunctionUnsafe("ImportDataOverlay.confirmSuccess");
-  } else {
-    base::FundamentalValue state(false);
-    web_ui()->CallJavascriptFunctionUnsafe(
-        "ImportDataOverlay.setImportingState", state);
-    web_ui()->CallJavascriptFunctionUnsafe("ImportDataOverlay.dismiss");
-  }
+  CallJavascriptFunction(
+      "cr.webUIListenerCallback",
+      base::StringValue("import-data-status-changed"),
+      base::StringValue(import_did_succeed_ ? kImportStatusSucceeded
+                                            : kImportStatusFailed));
 }
 
 void ImportDataHandler::FileSelected(const base::FilePath& path,
                                      int /*index*/,
                                      void* /*params*/) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   importer::SourceProfile source_profile;
   source_profile.importer_type = importer::TYPE_BOOKMARKS_FILE;
   source_profile.source_path = path;
@@ skipping 19 matching lines @@
                                   base::string16(),
                                   base::FilePath(),
                                   &file_type_info,
                                   0,
                                   base::FilePath::StringType(),
                                   browser->window()->GetNativeWindow(),
                                   NULL);
 }
 
 }  // namespace settings