Revert 43183 - Block database access on allowDatabase instead of databaseOpenFile.

BUG=36435
TEST=Set cookie settings to ASK and open a page with web databases.

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

TBR=jochen@chromium.org
Review URL: http://codereview.chromium.org/1595003

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

1 files changed, 27 insertions, 5 deletions

diff --git a/chrome/browser/views/database_open_info_view.h b/chrome/browser/views/database_open_info_view.h
index 63d24e2..84954f5 100644
--- a/chrome/browser/views/database_open_info_view.h
+++ b/chrome/browser/views/database_open_info_view.h
@@ -5,25 +5,47 @@
 #ifndef CHROME_BROWSER_VIEWS_DATABASE_OPEN_INFO_VIEW_H_
 #define CHROME_BROWSER_VIEWS_DATABASE_OPEN_INFO_VIEW_H_
 
+#include <string>
+#include <vector>
+
 #include "base/string16.h"
-#include "chrome/browser/views/generic_info_view.h"
+#include "views/view.h"
+
+namespace views {
+class Label;
+class Textfield;
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // DatabaseOpenInfoView
 //
 //  Responsible for displaying a tabular grid of Database information when
 //  prompting for permission to open a new database.
-class DatabaseOpenInfoView : public GenericInfoView {
+class DatabaseOpenInfoView : public views::View {
  public:
   DatabaseOpenInfoView();
+  virtual ~DatabaseOpenInfoView();
 
   // Update the display from the specified Database data.
   void SetFields(const std::string& host,
-                 const string16& database_name,
-                 const string16& display_name,
-                 unsigned long estimated_size);
+                 const string16& database_name);
+
+  // Enables or disables the local storate property text fields.
+  void EnableDisplay(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* host_value_field_;
+  views::Textfield* database_name_value_field_;
+
   DISALLOW_COPY_AND_ASSIGN(DatabaseOpenInfoView);
 };