Extract load times from WebDataSource. Move them to NavigationState.

Move PasswordForm into the webkit_glue namespace.

TEST=none
BUG=10041
R=brettw

Review URL: http://codereview.chromium.org/126190

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18515 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 3 deletions

diff --git a/chrome/browser/views/options/exceptions_page_view.cc b/chrome/browser/views/options/exceptions_page_view.cc
index 1718484..f9d77c9 100644
--- a/chrome/browser/views/options/exceptions_page_view.cc
+++ b/chrome/browser/views/options/exceptions_page_view.cc
@@ -17,6 +17,7 @@
 
 using views::ColumnSet;
 using views::GridLayout;
+using webkit_glue::PasswordForm;
 
 ///////////////////////////////////////////////////////////////////////////////
 // ExceptionsTableModel
diff --git a/chrome/browser/views/options/passwords_page_view.cc b/chrome/browser/views/options/passwords_page_view.cc
index 64da35b..bc73703 100644
--- a/chrome/browser/views/options/passwords_page_view.cc
+++ b/chrome/browser/views/options/passwords_page_view.cc
@@ -17,6 +17,7 @@
 
 using views::ColumnSet;
 using views::GridLayout;
+using webkit_glue::PasswordForm;
 
 ///////////////////////////////////////////////////////////////////////////////
 // MultiLabelButtons
diff --git a/chrome/browser/views/options/passwords_page_view.h b/chrome/browser/views/options/passwords_page_view.h
index 35cb31e..907ffb4 100644
--- a/chrome/browser/views/options/passwords_page_view.h
+++ b/chrome/browser/views/options/passwords_page_view.h
@@ -87,7 +87,7 @@ class PasswordsTableModel : public views::TableModel,
   void GetAllSavedLoginsForProfile();
 
   // Return the PasswordForm at the specified index.
-  PasswordForm* GetPasswordFormAt(int row);
+  webkit_glue::PasswordForm* GetPasswordFormAt(int row);
 
   // Set the observer who concerns about how many rows are in the table.
   void set_row_count_observer(PasswordsTableModelObserver* observer) {
@@ -98,7 +98,8 @@ class PasswordsTableModel : public views::TableModel,
   // Wraps the PasswordForm from the database and caches the display URL for
   // quick sorting.
   struct PasswordRow {
-    PasswordRow(const gfx::SortedDisplayURL& url, PasswordForm* password_form)
+    PasswordRow(const gfx::SortedDisplayURL& url,
+                webkit_glue::PasswordForm* password_form)
         : display_url(url), form(password_form) {
     }
 
@@ -106,7 +107,7 @@ class PasswordsTableModel : public views::TableModel,
     gfx::SortedDisplayURL display_url;
 
     // The underlying PasswordForm. We own this.
-    scoped_ptr<PasswordForm> form;
+    scoped_ptr<webkit_glue::PasswordForm> form;
   };
 
   // The web data service associated with the currently active profile.