| Index: chrome/browser/ui/webui/options/password_manager_handler.h
|
| diff --git a/chrome/browser/ui/webui/options/password_manager_handler.h b/chrome/browser/ui/webui/options/password_manager_handler.h
|
| index 520dbb8e7a92b03ec56ac9f5843104e296eb7593..486c84119b5d2aef2a7705d68864e146a267263b 100644
|
| --- a/chrome/browser/ui/webui/options/password_manager_handler.h
|
| +++ b/chrome/browser/ui/webui/options/password_manager_handler.h
|
| @@ -10,18 +10,24 @@
|
| #include <string>
|
| #include <vector>
|
|
|
| +#include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| #include "build/build_config.h"
|
| #include "chrome/browser/ui/passwords/password_manager_presenter.h"
|
| #include "chrome/browser/ui/passwords/password_ui_view.h"
|
| #include "chrome/browser/ui/webui/options/options_ui.h"
|
| +#include "components/password_manager/core/browser/import/password_importer.h"
|
| #include "components/prefs/pref_member.h"
|
| +#include "ui/shell_dialogs/select_file_dialog.h"
|
| +
|
| +class PasswordManagerHandlerTest;
|
|
|
| namespace options {
|
|
|
| // The WebUI based PasswordUIView. Displays passwords in the web ui.
|
| class PasswordManagerHandler : public OptionsPageUIHandler,
|
| - public PasswordUIView {
|
| + public PasswordUIView,
|
| + public ui::SelectFileDialog::Listener {
|
| public:
|
| PasswordManagerHandler();
|
| ~PasswordManagerHandler() override;
|
| @@ -29,8 +35,14 @@ class PasswordManagerHandler : public OptionsPageUIHandler,
|
| // OptionsPageUIHandler implementation.
|
| void GetLocalizedValues(base::DictionaryValue* localized_strings) override;
|
| void InitializeHandler() override;
|
| + void InitializePage() override;
|
| void RegisterMessages() override;
|
|
|
| + // ui::SelectFileDialog::Listener implementation
|
| + void FileSelected(const base::FilePath& path,
|
| + int index,
|
| + void* params) override;
|
| +
|
| // PasswordUIView implementation.
|
| Profile* GetProfile() override;
|
| void ShowPassword(
|
| @@ -47,6 +59,12 @@ class PasswordManagerHandler : public OptionsPageUIHandler,
|
| #if !defined(OS_ANDROID)
|
| gfx::NativeWindow GetNativeWindow() const override;
|
| #endif
|
| +
|
| + protected:
|
| + // This constructor is used for testing only.
|
| + explicit PasswordManagerHandler(
|
| + scoped_ptr<PasswordManagerPresenter> presenter);
|
| +
|
| private:
|
| // Clears and then populates the list of passwords and password exceptions.
|
| // Called when the JS PasswordManager object is initialized.
|
| @@ -64,8 +82,49 @@ class PasswordManagerHandler : public OptionsPageUIHandler,
|
| // |index| The index of the entry.
|
| void HandleRequestShowPassword(const base::ListValue* args);
|
|
|
| + // Import from CSV/JSON file. The steps are:
|
| + // 1. user click import button -> HandlePasswordImport() ->
|
| + // start file selector
|
| + // 2. user selects file -> ImportPasswordFileSeleted() -> read to memory
|
| + // 3. read completes -> ImportPasswordFileRead() -> store to PasswordStore
|
| + void HandlePasswordImport(const base::ListValue* args);
|
| + void ImportPasswordFileSelected(const base::FilePath& path);
|
| + void ImportPasswordFileRead(password_manager::PasswordImporter::Result result,
|
| + const std::vector<autofill::PasswordForm>& forms);
|
| +
|
| + // Export to CSV/JSON file. The steps are:
|
| + // 1. user click export button -> HandlePasswordExport() ->
|
| + // check OS password if necessary -> start file selector
|
| + // 2. user selects file -> ExportPasswordFileSeleted() ->
|
| + // write to memory buffer -> start write operation
|
| + void HandlePasswordExport(const base::ListValue* args);
|
| + void ExportPasswordFileSelected(const base::FilePath& path);
|
| +
|
| + // A short class to persist imported password forms to password store.
|
| + class ImportPasswordResultConsumer
|
| + : public base::RefCountedThreadSafe<ImportPasswordResultConsumer> {
|
| + public:
|
| + explicit ImportPasswordResultConsumer(Profile* profile);
|
| +
|
| + void ConsumePassword(password_manager::PasswordImporter::Result result,
|
| + const std::vector<autofill::PasswordForm>& forms);
|
| +
|
| + private:
|
| + friend class base::RefCountedThreadSafe<ImportPasswordResultConsumer>;
|
| +
|
| + ~ImportPasswordResultConsumer() {}
|
| +
|
| + Profile* profile_;
|
| + };
|
| +
|
| + // User pref for storing accept languages.
|
| + std::string languages_;
|
| +
|
| // The PasswordManagerPresenter object owned by the this view.
|
| - PasswordManagerPresenter password_manager_presenter_;
|
| + scoped_ptr<PasswordManagerPresenter> password_manager_presenter_;
|
| +
|
| + // Handle for file picker
|
| + scoped_refptr<ui::SelectFileDialog> selected_file_dialog_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PasswordManagerHandler);
|
| };
|
|
|