Merge Chromium at r66597: Initial merge by git.

Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b

1 files changed, 3 insertions, 46 deletions

diff --git a/chrome/browser/views/database_info_view.h b/chrome/browser/views/database_info_view.h
index 269d3c4..5f7e747 100644
--- a/chrome/browser/views/database_info_view.h
+++ b/chrome/browser/views/database_info_view.h
@@ -6,51 +6,8 @@
 #define CHROME_BROWSER_VIEWS_DATABASE_INFO_VIEW_H_
 #pragma once
 
-#include "views/view.h"
-#include "chrome/browser/browsing_data_database_helper.h"
-
-namespace views {
-class Label;
-class Textfield;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// DatabaseInfoView
-//
-//  Responsible for displaying a tabular grid of Database information.
-class DatabaseInfoView : public views::View {
- public:
-  DatabaseInfoView();
-  virtual ~DatabaseInfoView();
-
-  // Update the display from the specified Database info.
-  void SetDatabaseInfo(
-      const BrowsingDataDatabaseHelper::DatabaseInfo& database_info);
-
-  // Clears the cookie display to indicate that no or multiple databases are
-  // selected.
-  void ClearDatabaseDisplay();
-
-  // Enables or disables the database property text fields.
-  void EnableDatabaseDisplay(bool enabled);
-
- protected:
-  // views::View overrides:
-  virtual void ViewHierarchyChanged(
-      bool is_add, views::View* parent, views::View* child);
-
- private:
-  // Set up the view layout.
-  void Init();
-
-  // Individual property labels.
-  views::Textfield* name_value_field_;
-  views::Textfield* description_value_field_;
-  views::Textfield* size_value_field_;
-  views::Textfield* last_modified_value_field_;
-
-  DISALLOW_COPY_AND_ASSIGN(DatabaseInfoView);
-};
-
+#include "chrome/browser/ui/views/database_info_view.h"
+// TODO(beng): remove this file once all includes have been updated.
 
 #endif  // CHROME_BROWSER_VIEWS_DATABASE_INFO_VIEW_H_
+