| Index: chrome/browser/ui/webui/settings/settings_import_data_handler.h
|
| diff --git a/chrome/browser/ui/webui/options/import_data_handler.h b/chrome/browser/ui/webui/settings/settings_import_data_handler.h
|
| similarity index 73%
|
| copy from chrome/browser/ui/webui/options/import_data_handler.h
|
| copy to chrome/browser/ui/webui/settings/settings_import_data_handler.h
|
| index 32bea2b08f3fbff9b502d511881ac860b04846f2..c36bd7723e48cb7acc5230be5d5c2d89897b77a3 100644
|
| --- a/chrome/browser/ui/webui/options/import_data_handler.h
|
| +++ b/chrome/browser/ui/webui/settings/settings_import_data_handler.h
|
| @@ -1,9 +1,9 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// 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.
|
|
|
| -#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_
|
| -#define CHROME_BROWSER_UI_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_
|
| +#ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_SETTINGS_IMPORT_DATA_HANDLER_H_
|
| +#define CHROME_BROWSER_UI_WEBUI_SETTINGS_SETTINGS_IMPORT_DATA_HANDLER_H_
|
|
|
| #include <stdint.h>
|
|
|
| @@ -12,30 +12,27 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| #include "chrome/browser/importer/importer_progress_observer.h"
|
| -#include "chrome/browser/ui/webui/options/options_ui.h"
|
| +#include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
|
| #include "chrome/common/importer/importer_data_types.h"
|
| #include "ui/shell_dialogs/select_file_dialog.h"
|
|
|
| class ExternalProcessImporterHost;
|
| class ImporterList;
|
|
|
| -namespace options {
|
| +namespace settings {
|
|
|
| // Chrome personal stuff import data overlay UI handler.
|
| -class ImportDataHandler : public OptionsPageUIHandler,
|
| +class ImportDataHandler : public SettingsPageUIHandler,
|
| public importer::ImporterProgressObserver,
|
| public ui::SelectFileDialog::Listener {
|
| public:
|
| ImportDataHandler();
|
| ~ImportDataHandler() override;
|
|
|
| - // OptionsPageUIHandler:
|
| - void GetLocalizedValues(base::DictionaryValue* localized_strings) override;
|
| - void InitializeHandler() override;
|
| - void InitializePage() override;
|
| -
|
| - // content::WebUIMessageHandler:
|
| + // SettingsPageUIHandler
|
| void RegisterMessages() override;
|
| + void OnJavascriptAllowed() override {}
|
| + void OnJavascriptDisallowed() override;
|
|
|
| private:
|
| void StartImport(const importer::SourceProfile& source_profile,
|
| @@ -43,6 +40,9 @@ class ImportDataHandler : public OptionsPageUIHandler,
|
|
|
| void ImportData(const base::ListValue* args);
|
|
|
| + void InitializeDialog(const base::ListValue* args);
|
| + void SendBrowserProfileData();
|
| +
|
| // importer::ImporterProgressObserver:
|
| void ImportStarted() override;
|
| void ImportItemStarted(importer::ImportItem item) override;
|
| @@ -70,6 +70,6 @@ class ImportDataHandler : public OptionsPageUIHandler,
|
| DISALLOW_COPY_AND_ASSIGN(ImportDataHandler);
|
| };
|
|
|
| -} // namespace options
|
| +} // namespace settings
|
|
|
| -#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_
|
| +#endif // CHROME_BROWSER_UI_WEBUI_SETTINGS_SETTINGS_IMPORT_DATA_HANDLER_H_
|
|
|