Porting in browser/webdata and template_url.

chrome/browser/webdata/web_database.h

 // Copyright (c) 2006-2008 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_WEBDATA_WEB_DATABASE_H__
 #define CHROME_BROWSER_WEBDATA_WEB_DATABASE_H__
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "chrome/browser/meta_table_helper.h"
 #include "chrome/browser/template_url.h"
 #include "chrome/common/sqlite_utils.h"
 #include "skia/include/SkBitmap.h"
 #include "webkit/glue/autofill_form.h"
 
 namespace base {
   class Time;
 }
 struct PasswordForm;
+#if defined(OS_WIN)
 struct IE7PasswordInfo;
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // A Sqlite database instance to store all the meta data we have about web pages
 //
 ////////////////////////////////////////////////////////////////////////////////
 class WebDatabase {
  public:
   WebDatabase();
   ~WebDatabase();
@@ skipping 39 matching lines @@
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // Password manager support
   //
   //////////////////////////////////////////////////////////////////////////////
 
   // Adds |form| to the list of remembered password forms.
   bool AddLogin(const PasswordForm& form);
 
+#if defined(OS_WIN)
   // Adds |info| to the list of imported passwords from ie7/ie8.
   bool AddIE7Login(const IE7PasswordInfo& info);
 
+  // Removes |info| from the list of imported passwords from ie7/ie8.
+  bool RemoveIE7Login(const IE7PasswordInfo& info);
+
+  // Return the ie7/ie8 login matching |info|.
+  bool GetIE7Login(const IE7PasswordInfo& info, IE7PasswordInfo* result);
+#endif
+
   // Updates remembered password form.
   bool UpdateLogin(const PasswordForm& form);
 
   // Removes |form| from the list of remembered password forms.
   bool RemoveLogin(const PasswordForm& form);
 
-  // Removes |info| from the list of imported passwords from ie7/ie8.
-  bool RemoveIE7Login(const IE7PasswordInfo& info);
-
   // Removes all logins created from |delete_begin| onwards (inclusive) and
   // before |delete_end|. You may use a null Time value to do an unbounded
   // delete in either direction.
   bool RemoveLoginsCreatedBetween(const base::Time delete_begin,
                                   const base::Time delete_end);
 
   // Loads a list of matching password forms into the specified vector |forms|.
   // The list will contain all possibly relevant entries to the observed |form|,
   // including blacklisted matches.
   bool GetLogins(const PasswordForm& form, std::vector<PasswordForm*>* forms);
 
-  // Return the ie7/ie8 login matching |info|.
-  bool GetIE7Login(const IE7PasswordInfo& info, IE7PasswordInfo* result);
-
   // Loads the complete list of password forms into the specified vector |forms|
   // if include_blacklisted is true, otherwise only loads those which are
   // actually autofillable; i.e haven't been blacklisted by the user selecting
   // the 'Never for this site' button.
   bool GetAllLogins(std::vector<PasswordForm*>* forms,
                     bool include_blacklisted);
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // Autofill
@@ skipping 80 matching lines @@
   bool InitAutofillDatesTable();
   bool InitWebAppIconsTable();
   bool InitWebAppsTable();
 
   void MigrateOldVersionsAsNeeded();
 
   sqlite3* db_;
   int transaction_nesting_;
   MetaTableHelper meta_table_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(WebDatabase);
+  DISALLOW_COPY_AND_ASSIGN(WebDatabase);
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_WEB_DATABASE_H__