Merge browser/ui/password and browser/ui/passwords.

chrome/browser/ui/webui/options/password_manager_presenter.h

Index: chrome/browser/ui/webui/options/password_manager_presenter.h
diff --git a/chrome/browser/ui/webui/options/password_manager_presenter.h b/chrome/browser/ui/webui/options/password_manager_presenter.h
deleted file mode 100644
index 3fcf164175b124bc61b67c710c57415d5062a102..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/webui/options/password_manager_presenter.h
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright 2013 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_PRESENTER_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_PRESENTER_H_
-
-#include <string>
-#include <vector>
-
-#include "base/memory/scoped_vector.h"
-#include "base/prefs/pref_member.h"
-#include "chrome/browser/password_manager/password_store.h"
-#include "chrome/browser/password_manager/password_store_consumer.h"
-#include "chrome/browser/ui/webui/options/options_ui.h"
-
-namespace autofill {
-struct PasswordForm;
-}
-
-namespace passwords_ui {
-class PasswordUIView;
-}
-
-class Profile;
-
-namespace options {
-
-// Contains the common logic used by a PasswordUIView to
-// interact with PasswordStore. It provides completion callbacks for
-// PasswordStore operations and updates the view on PasswordStore changes.
-class PasswordManagerPresenter : public PasswordStore::Observer {
- public:
-  // |password_view| the UI view that owns this presenter, must not be NULL.
-  explicit PasswordManagerPresenter(
-      passwords_ui::PasswordUIView* password_view);
-  virtual ~PasswordManagerPresenter();
-
-  // PasswordStore::Observer implementation.
-  virtual void OnLoginsChanged() OVERRIDE;
-
-  // Repopulates the password and exception entries.
-  void UpdatePasswordLists();
-
-  void Initialize();
-
-  // Gets the password entry at |index|.
-  const autofill::PasswordForm& GetPassword(size_t index);
-
-  // Gets the password exception entry at |index|.
-  const autofill::PasswordForm& GetPasswordException(size_t index);
-
-  // Removes the saved password entry at |index|.
-  // |index| the entry index to be removed.
-  void HandleRemoveSavedPassword(size_t index);
-
-  // Removes the saved password exception entry at |index|.
-  // |index| the entry index to be removed.
-  void HandleRemovePasswordException(size_t index);
-
-  // Requests the plain text password for entry at |index| to be revealed.
-  // |index| The index of the entry.
-  void HandleRequestShowPassword(size_t index);
-
- private:
-  friend class PasswordManagerPresenterTest;
-
-  // Returns the password store associated with the currently active profile.
-  PasswordStore* GetPasswordStore();
-
-  // Returns true if the user needs to be authenticated before a plaintext
-  // password is revealed.
-  bool IsAuthenticationRequired();
-
-  // Sets the password and exception list of the UI view.
-  void SetPasswordList();
-  void SetPasswordExceptionList();
-
-  // A short class to mediate requests to the password store.
-  class ListPopulater : public PasswordStoreConsumer {
-   public:
-    explicit ListPopulater(PasswordManagerPresenter* page);
-    virtual ~ListPopulater();
-
-    // Send a query to the password store to populate a list.
-    virtual void Populate() = 0;
-
-   protected:
-    PasswordManagerPresenter* page_;
-    CancelableRequestProvider::Handle pending_login_query_;
-  };
-
-  // A short class to mediate requests to the password store for passwordlist.
-  class PasswordListPopulater : public ListPopulater {
-   public:
-    explicit PasswordListPopulater(PasswordManagerPresenter* page);
-
-    // Send a query to the password store to populate a password list.
-    virtual void Populate() OVERRIDE;
-
-    // Send the password store's reply back to the handler.
-    virtual void OnPasswordStoreRequestDone(
-        CancelableRequestProvider::Handle handle,
-        const std::vector<autofill::PasswordForm*>& result) OVERRIDE;
-    virtual void OnGetPasswordStoreResults(
-        const std::vector<autofill::PasswordForm*>& results) OVERRIDE;
-  };
-
-  // A short class to mediate requests to the password store for exceptions.
-  class PasswordExceptionListPopulater : public ListPopulater {
-   public:
-    explicit PasswordExceptionListPopulater(PasswordManagerPresenter* page);
-
-    // Send a query to the password store to populate a passwordException list.
-    virtual void Populate() OVERRIDE;
-
-    // Send the password store's reply back to the handler.
-    virtual void OnPasswordStoreRequestDone(
-        CancelableRequestProvider::Handle handle,
-        const std::vector<autofill::PasswordForm*>& result) OVERRIDE;
-    virtual void OnGetPasswordStoreResults(
-        const std::vector<autofill::PasswordForm*>& results) OVERRIDE;
-  };
-
-  // Password store consumer for populating the password list and exceptions.
-  PasswordListPopulater populater_;
-  PasswordExceptionListPopulater exception_populater_;
-
-  ScopedVector<autofill::PasswordForm> password_list_;
-  ScopedVector<autofill::PasswordForm> password_exception_list_;
-
-  // Whether to show stored passwords or not.
-  BooleanPrefMember show_passwords_;
-
-  // Indicates whether or not the password manager should require the user to
-  // reauthenticate before revealing plaintext passwords.
-  bool require_reauthentication_;
-
-  // The last time the user was successfully authenticated.
-  // Used to determine whether or not to reveal plaintext passwords.
-  base::TimeTicks last_authentication_time_;
-
-  // UI view that owns this presenter.
-  passwords_ui::PasswordUIView* password_view_;
-
-  DISALLOW_COPY_AND_ASSIGN(PasswordManagerPresenter);
-};
-
-}  // namespace options
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_PRESENTER_H_