Group forms-related files in webkit/glue in a forms/ subdirectory.

chrome/browser/password_manager/native_backend_kwallet_x.h

 // Copyright (c) 2011 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_PASSWORD_MANAGER_NATIVE_BACKEND_KWALLET_X_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_KWALLET_X_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
 #include "chrome/browser/password_manager/password_store_x.h"
 #include "chrome/browser/profiles/profile.h"
 
 class Pickle;
 class PrefService;
 
-namespace webkit_glue {
+namespace webkit {
+namespace forms {
 struct PasswordForm;
 }
+}
 
 namespace base {
 class WaitableEvent;
 }
 
 namespace dbus {
 class Bus;
 class ObjectProxy;
 }
 
 // NativeBackend implementation using KWallet.
 class NativeBackendKWallet : public PasswordStoreX::NativeBackend {
  public:
   NativeBackendKWallet(LocalProfileId id, PrefService* prefs);
 
   virtual ~NativeBackendKWallet();
 
   virtual bool Init() OVERRIDE;
 
   // Implements NativeBackend interface.
-  virtual bool AddLogin(const webkit_glue::PasswordForm& form) OVERRIDE;
-  virtual bool UpdateLogin(const webkit_glue::PasswordForm& form) OVERRIDE;
-  virtual bool RemoveLogin(const webkit_glue::PasswordForm& form) OVERRIDE;
+  virtual bool AddLogin(const webkit::forms::PasswordForm& form) OVERRIDE;
+  virtual bool UpdateLogin(const webkit::forms::PasswordForm& form) OVERRIDE;
+  virtual bool RemoveLogin(const webkit::forms::PasswordForm& form) OVERRIDE;
   virtual bool RemoveLoginsCreatedBetween(
       const base::Time& delete_begin, const base::Time& delete_end) OVERRIDE;
-  virtual bool GetLogins(const webkit_glue::PasswordForm& form,
+  virtual bool GetLogins(const webkit::forms::PasswordForm& form,
                          PasswordFormList* forms) OVERRIDE;
   virtual bool GetLoginsCreatedBetween(const base::Time& get_begin,
                                        const base::Time& get_end,
                                        PasswordFormList* forms) OVERRIDE;
   virtual bool GetAutofillableLogins(PasswordFormList* forms) OVERRIDE;
   virtual bool GetBlacklistLogins(PasswordFormList* forms) OVERRIDE;
 
  protected:
   // Invalid handle returned by WalletHandle().
   static const int kInvalidKWalletHandle = -1;
@@ skipping 47 matching lines @@
                      int wallet_handle);
 
   // Opens the wallet and ensures that the "Chrome Form Data" folder exists.
   // Returns kInvalidWalletHandle on error.
   int WalletHandle();
 
   // Compares two PasswordForms and returns true if they are the same.
   // If |update_check| is false, we only check the fields that are checked by
   // LoginDatabase::UpdateLogin() when updating logins; otherwise, we check the
   // fields that are checked by LoginDatabase::RemoveLogin() for removing them.
-  static bool CompareForms(const webkit_glue::PasswordForm& a,
-                           const webkit_glue::PasswordForm& b,
+  static bool CompareForms(const webkit::forms::PasswordForm& a,
+                           const webkit::forms::PasswordForm& b,
                            bool update_check);
 
   // Serializes a list of PasswordForms to be stored in the wallet.
   static void SerializeValue(const PasswordFormList& forms, Pickle* pickle);
 
   // Checks a serialized list of PasswordForms for sanity. Returns true if OK.
   // Note that |realm| is only used for generating a useful warning message.
   static bool CheckSerializedValue(const uint8_t* byte_array, size_t length,
                                    const std::string& realm);
 
@@ skipping 41 matching lines @@
 
   // The name of the wallet we've opened. Set during Init().
   std::string wallet_name_;
   // The application name (e.g. "Chromium"), shown in KWallet auth dialogs.
   const std::string app_name_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeBackendKWallet);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_KWALLET_X_H_