| Index: chrome/browser/ui/webui/settings/passwords_handler.h
|
| diff --git a/chrome/browser/ui/webui/options/password_manager_handler.h b/chrome/browser/ui/webui/settings/passwords_handler.h
|
| similarity index 66%
|
| copy from chrome/browser/ui/webui/options/password_manager_handler.h
|
| copy to chrome/browser/ui/webui/settings/passwords_handler.h
|
| index fc09064178f3ed5a26ed4cd1f96d8a4ce5f40a3e..00749648c9203463513fcc3ed145f3a00293eab1 100644
|
| --- a/chrome/browser/ui/webui/options/password_manager_handler.h
|
| +++ b/chrome/browser/ui/webui/settings/passwords_handler.h
|
| @@ -1,9 +1,9 @@
|
| -// Copyright 2013 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_PASSWORD_MANAGER_HANDLER_H_
|
| -#define CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_
|
| +#ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_PASSWORDS_HANDLER_H_
|
| +#define CHROME_BROWSER_UI_WEBUI_SETTINGS_PASSWORDS_HANDLER_H_
|
|
|
| #include <stddef.h>
|
|
|
| @@ -15,29 +15,25 @@
|
| #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 "chrome/browser/ui/webui/settings/md_settings_ui.h"
|
|
|
| -namespace options {
|
| +namespace settings {
|
|
|
| // The WebUI based PasswordUIView. Displays passwords in the web ui.
|
| -class PasswordManagerHandler : public OptionsPageUIHandler,
|
| - public PasswordUIView {
|
| +class PasswordsHandler : public SettingsPageUIHandler, public PasswordUIView {
|
| public:
|
| - PasswordManagerHandler();
|
| - ~PasswordManagerHandler() override;
|
| + PasswordsHandler();
|
| + ~PasswordsHandler() override;
|
|
|
| - // OptionsPageUIHandler implementation.
|
| - void GetLocalizedValues(base::DictionaryValue* localized_strings) override;
|
| - void InitializeHandler() override;
|
| + // SettingsPageUIHandler implementation.
|
| void RegisterMessages() override;
|
|
|
| // PasswordUIView implementation.
|
| Profile* GetProfile() override;
|
| - void ShowPassword(
|
| - size_t index,
|
| - const std::string& origin_url,
|
| - const std::string& username,
|
| - const base::string16& password_value) override;
|
| + void ShowPassword(size_t index,
|
| + const std::string& origin_url,
|
| + const std::string& username,
|
| + const base::string16& password_value) override;
|
| void SetPasswordList(
|
| const std::vector<scoped_ptr<autofill::PasswordForm>>& password_list,
|
| bool show_passwords) override;
|
| @@ -47,6 +43,7 @@ class PasswordManagerHandler : public OptionsPageUIHandler,
|
| #if !defined(OS_ANDROID)
|
| gfx::NativeWindow GetNativeWindow() const override;
|
| #endif
|
| +
|
| private:
|
| // Clears and then populates the list of passwords and password exceptions.
|
| // Called when the JS PasswordManager object is initialized.
|
| @@ -70,9 +67,9 @@ class PasswordManagerHandler : public OptionsPageUIHandler,
|
| // The PasswordManagerPresenter object owned by the this view.
|
| PasswordManagerPresenter password_manager_presenter_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(PasswordManagerHandler);
|
| + DISALLOW_COPY_AND_ASSIGN(PasswordsHandler);
|
| };
|
|
|
| -} // namespace options
|
| +} // namespace settings
|
|
|
| -#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_
|
| +#endif // CHROME_BROWSER_UI_WEBUI_SETTINGS_PASSWORDS_HANDLER_H_
|
|
|