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

chrome/browser/ui/passwords/password_manager_presenter.h

 // 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_
+#ifndef CHROME_BROWSER_UI_PASSWORDS_PASSWORD_MANAGER_PRESENTER_H_
+#define CHROME_BROWSER_UI_PASSWORDS_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 {
+namespace passwords_ui {

[Patrick Dubroy, 2013/11/13 11:38:07]

I don't think you need this namespace. I think the general consensus on Chrome
is slightly biased against namespaces (see
https://groups.google.com/a/chromium.org/d/msg/chromium-dev/OIkJO2KQKTQ/YQzUS...),
and in this case the class is already unambiguously named.

[shashi, 2013/11/13 17:44:22]

Done.

 
 // 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);
+  void RemoveSavedPassword(size_t index);

[Patrick Dubroy, 2013/11/13 11:38:07]

+1 for renaming these :-)

 
   // Removes the saved password exception entry at |index|.
   // |index| the entry index to be removed.
-  void HandleRemovePasswordException(size_t index);
+  void RemovePasswordException(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);
+  void RequestShowPassword(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();
@@ skipping 60 matching lines @@
 
   // 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_;
+  PasswordUIView* password_view_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordManagerPresenter);
 };
 
-}  // namespace options
+}  // namespace passwords_ui
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_PRESENTER_H_
+#endif  // CHROME_BROWSER_UI_PASSWORDS_PASSWORD_MANAGER_PRESENTER_H_