Block database access on allowDatabase instead of databaseOpenFile.

chrome/browser/gtk/gtk_chrome_cookie_view.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/gtk/gtk_chrome_cookie_view.h"
 
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/gtk/gtk_util.h"
@@ skipping 83 matching lines @@
   InitBrowserDetailStyle(self->local_storage_item_key_entry_, label_style,
                          dialog_style);
   InitBrowserDetailStyle(self->local_storage_item_value_entry_, label_style,
                          dialog_style);
 
   // Database accessed item.
   InitBrowserDetailStyle(self->database_accessed_origin_entry_, label_style,
                          dialog_style);
   InitBrowserDetailStyle(self->database_accessed_name_entry_, label_style,
                          dialog_style);
+  InitBrowserDetailStyle(self->database_accessed_description_entry_,
+                         label_style, dialog_style);
+  InitBrowserDetailStyle(self->database_accessed_size_entry_, label_style,
+                         dialog_style);
 
   // AppCache created item.
   InitBrowserDetailStyle(self->appcache_created_manifest_entry_, label_style,
                          dialog_style);
 }
 
 void SetCookieDetailsSensitivity(GtkChromeCookieView *self,
                                  gboolean enabled) {
   gtk_widget_set_sensitive(self->cookie_name_entry_, enabled);
   gtk_widget_set_sensitive(self->cookie_content_entry_, enabled);
@@ skipping 31 matching lines @@
                                     gboolean enabled) {
   gtk_widget_set_sensitive(self->local_storage_item_origin_entry_, enabled);
   gtk_widget_set_sensitive(self->local_storage_item_key_entry_, enabled);
   gtk_widget_set_sensitive(self->local_storage_item_value_entry_, enabled);
 }
 
 void SetDatabaseAccessedSensitivity(GtkChromeCookieView* self,
                                     gboolean enabled) {
   gtk_widget_set_sensitive(self->database_accessed_origin_entry_, enabled);
   gtk_widget_set_sensitive(self->database_accessed_name_entry_, enabled);
+  gtk_widget_set_sensitive(self->database_accessed_description_entry_, enabled);
+  gtk_widget_set_sensitive(self->database_accessed_size_entry_, enabled);
 }
 
 void SetAppCacheCreatedSensitivity(GtkChromeCookieView* self,
                                    gboolean enabled) {
   gtk_widget_set_sensitive(self->appcache_created_manifest_entry_, enabled);
 }
 
 void ClearCookieDetails(GtkChromeCookieView *self) {
   std::string no_cookie =
       l10n_util::GetStringUTF8(IDS_COOKIES_COOKIE_NONESELECTED);
@@ skipping 161 matching lines @@
   gtk_table_set_col_spacing(GTK_TABLE(self->local_storage_item_table_), 0,
                             gtk_util::kLabelSpacing);
 
   row = 0;
   InitDetailRow(row++, IDS_COOKIES_COOKIE_DOMAIN_LABEL,
                 self->database_accessed_table_,
                 &self->database_accessed_origin_entry_);
   InitDetailRow(row++, IDS_COOKIES_WEB_DATABASE_NAME,
                 self->database_accessed_table_,
                 &self->database_accessed_name_entry_);
+  InitDetailRow(row++, IDS_COOKIES_WEB_DATABASE_DESCRIPTION_LABEL,
+                self->database_accessed_table_,
+                &self->database_accessed_description_entry_);
+  InitDetailRow(row++, IDS_COOKIES_SIZE_LABEL,
+                self->database_accessed_table_,
+                &self->database_accessed_size_entry_);
 
   // AppCache created prompt.
   self->appcache_created_table_ = gtk_table_new(1, 2, FALSE);
   gtk_container_add(GTK_CONTAINER(self->table_box_),
                     self->appcache_created_table_);
   gtk_table_set_col_spacing(GTK_TABLE(self->appcache_created_table_), 0,
                             gtk_util::kLabelSpacing);
   row = 0;
   InitDetailRow(row++, IDS_COOKIES_APPLICATION_CACHE_MANIFEST_LABEL,
                 self->appcache_created_table_,
@@ skipping 142 matching lines @@
   gtk_entry_set_text(GTK_ENTRY(self->local_storage_item_key_entry_),
                      UTF16ToUTF8(key).c_str());
   gtk_entry_set_text(GTK_ENTRY(self->local_storage_item_value_entry_),
                      UTF16ToUTF8(value).c_str());
   SetLocalStorageItemSensitivity(self, TRUE);
 }
 
 void gtk_chrome_cookie_view_display_database_accessed(
     GtkChromeCookieView* self,
     const std::string& host,
-    const string16& database_name) {
+    const string16& database_name,
+    const string16& display_name,
+    unsigned long estimated_size) {
   UpdateVisibleDetailedInfo(self, self->database_accessed_table_);
 
   gtk_entry_set_text(GTK_ENTRY(self->database_accessed_origin_entry_),
                      host.c_str());
   gtk_entry_set_text(GTK_ENTRY(self->database_accessed_name_entry_),
                      UTF16ToUTF8(database_name).c_str());
+  gtk_entry_set_text(GTK_ENTRY(self->database_accessed_description_entry_),
+                     UTF16ToUTF8(display_name).c_str());
+  gtk_entry_set_text(GTK_ENTRY(self->database_accessed_size_entry_),
+                     WideToUTF8(FormatBytes(
+                         estimated_size,
+                         GetByteDisplayUnits(estimated_size),
+                         true)).c_str());
   SetDatabaseAccessedSensitivity(self, TRUE);
 }
 
 void gtk_chrome_cookie_view_display_appcache_created(
     GtkChromeCookieView* self,
     const GURL& manifest_url) {
   UpdateVisibleDetailedInfo(self, self->appcache_created_table_);
   gtk_entry_set_text(GTK_ENTRY(self->appcache_created_manifest_entry_),
                      manifest_url.spec().c_str());
   SetAppCacheCreatedSensitivity(self, TRUE);
 }