Make the setItem CONTENT_SETTING_ASK dialog more useful by showing the actual...

chrome/browser/views/local_storage_set_item_info_view.cc

Index: chrome/browser/views/local_storage_set_item_info_view.cc
===================================================================
--- chrome/browser/views/local_storage_set_item_info_view.cc	(revision 38896)
+++ chrome/browser/views/local_storage_set_item_info_view.cc	(working copy)
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/views/local_storage_info_view.h"
+#include "chrome/browser/views/local_storage_set_item_info_view.h"
 
 #include <algorithm>
 
@@ -16,53 +16,49 @@
 #include "views/controls/textfield/textfield.h"
 #include "views/standard_layout.h"
 
-static const int kLocalStorageInfoViewBorderSize = 1;
-static const int kLocalStorageInfoViewInsetSize = 3;
+static const int kLocalStorageSetItemInfoViewBorderSize = 1;
+static const int kLocalStorageSetItemInfoViewInsetSize = 3;
 
 ///////////////////////////////////////////////////////////////////////////////
-// LocalStorageInfoView, public:
+// LocalStorageSetItemInfoView, public:
 
-LocalStorageInfoView::LocalStorageInfoView()
-    : origin_value_field_(NULL),
-      size_value_field_(NULL),
-      last_modified_value_field_(NULL) {
+LocalStorageSetItemInfoView::LocalStorageSetItemInfoView()
+    : host_value_field_(NULL),
+      key_value_field_(NULL),
+      value_value_field_(NULL) {
 }
 
-LocalStorageInfoView::~LocalStorageInfoView() {
+LocalStorageSetItemInfoView::~LocalStorageSetItemInfoView() {
 }
 
-void LocalStorageInfoView::SetLocalStorageInfo(
-    const BrowsingDataLocalStorageHelper::LocalStorageInfo&
-    local_storage_info) {
-  origin_value_field_->SetText(UTF8ToWide(local_storage_info.origin));
-  size_value_field_->SetText(
-      FormatBytes(local_storage_info.size,
-                  GetByteDisplayUnits(local_storage_info.size),
-                  true));
-  last_modified_value_field_->SetText(
-      base::TimeFormatFriendlyDateAndTime(local_storage_info.last_modified));
+void LocalStorageSetItemInfoView::SetFields(const std::string& host,
+                                            const string16& key,
+                                            const string16& value) {
+  host_value_field_->SetText(UTF8ToWide(host));
+  key_value_field_->SetText(key);
+  value_value_field_->SetText(value);
   EnableLocalStorageDisplay(true);
 }
 
-void LocalStorageInfoView::EnableLocalStorageDisplay(bool enabled) {
-  origin_value_field_->SetEnabled(enabled);
-  size_value_field_->SetEnabled(enabled);
-  last_modified_value_field_->SetEnabled(enabled);
+void LocalStorageSetItemInfoView::EnableLocalStorageDisplay(bool enabled) {
+  host_value_field_->SetEnabled(enabled);
+  key_value_field_->SetEnabled(enabled);
+  value_value_field_->SetEnabled(enabled);
 }
 
-void LocalStorageInfoView::ClearLocalStorageDisplay() {
+void LocalStorageSetItemInfoView::ClearLocalStorageDisplay() {
   std::wstring no_cookie_string =
       l10n_util::GetString(IDS_COOKIES_COOKIE_NONESELECTED);
-  origin_value_field_->SetText(no_cookie_string);
-  size_value_field_->SetText(no_cookie_string);
-  last_modified_value_field_->SetText(no_cookie_string);
+  host_value_field_->SetText(no_cookie_string);
+  key_value_field_->SetText(no_cookie_string);
+  value_value_field_->SetText(no_cookie_string);
   EnableLocalStorageDisplay(false);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// LocalStorageInfoView, views::View overrides:
+// LocalStorageSetItemInfoView, views::View overrides:
 
-void LocalStorageInfoView::ViewHierarchyChanged(bool is_add,
+void LocalStorageSetItemInfoView::ViewHierarchyChanged(bool is_add,
                                                 views::View* parent,
                                                 views::View* child) {
   if (is_add && child == this)
@@ -70,31 +66,32 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// LocalStorageInfoView, private:
+// LocalStorageSetItemInfoView, private:
 
-void LocalStorageInfoView::Init() {
+void LocalStorageSetItemInfoView::Init() {
   SkColor border_color = color_utils::GetSysSkColor(COLOR_3DSHADOW);
   views::Border* border = views::Border::CreateSolidBorder(
-      kLocalStorageInfoViewBorderSize, border_color);
+      kLocalStorageSetItemInfoViewBorderSize, border_color);
   set_border(border);
 
-  views::Label* origin_label = new views::Label(
-      l10n_util::GetString(IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL));
-  origin_value_field_ = new views::Textfield;
-  views::Label* size_label = new views::Label(
-      l10n_util::GetString(IDS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL));
-  size_value_field_ = new views::Textfield;
-  views::Label* last_modified_label = new views::Label(
-      l10n_util::GetString(IDS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL));
-  last_modified_value_field_ = new views::Textfield;
+  // TODO(jorlow): These strings are not quite right, but we're post-freeze.
+  views::Label* host_label = new views::Label(
+      l10n_util::GetString(IDS_COOKIES_COOKIE_DOMAIN_LABEL));
+  host_value_field_ = new views::Textfield;
+  views::Label* key_label = new views::Label(
+      l10n_util::GetString(IDS_COOKIES_COOKIE_NAME_LABEL));
+  key_value_field_ = new views::Textfield;
+  views::Label* value_label = new views::Label(
+      l10n_util::GetString(IDS_COOKIES_COOKIE_CONTENT_LABEL));
+  value_value_field_ = new views::Textfield;
 
   using views::GridLayout;
 
   GridLayout* layout = new GridLayout(this);
-  layout->SetInsets(kLocalStorageInfoViewInsetSize,
-                    kLocalStorageInfoViewInsetSize,
-                    kLocalStorageInfoViewInsetSize,
-                    kLocalStorageInfoViewInsetSize);
+  layout->SetInsets(kLocalStorageSetItemInfoViewInsetSize,
+                    kLocalStorageSetItemInfoViewInsetSize,
+                    kLocalStorageSetItemInfoViewInsetSize,
+                    kLocalStorageSetItemInfoViewInsetSize);
   SetLayoutManager(layout);
 
   int three_column_layout_id = 0;
@@ -106,28 +103,28 @@
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, three_column_layout_id);
-  layout->AddView(origin_label);
-  layout->AddView(origin_value_field_);
+  layout->AddView(host_label);
+  layout->AddView(host_value_field_);
   layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
   layout->StartRow(0, three_column_layout_id);
-  layout->AddView(size_label);
-  layout->AddView(size_value_field_);
+  layout->AddView(key_label);
+  layout->AddView(key_value_field_);
   layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
   layout->StartRow(0, three_column_layout_id);
-  layout->AddView(last_modified_label);
-  layout->AddView(last_modified_value_field_);
+  layout->AddView(value_label);
+  layout->AddView(value_value_field_);
 
   // Color these borderless text areas the same as the containing dialog.
   SkColor text_area_background = color_utils::GetSysSkColor(COLOR_3DFACE);
   // Now that the Textfields are in the view hierarchy, we can initialize them.
-  origin_value_field_->SetReadOnly(true);
-  origin_value_field_->RemoveBorder();
-  origin_value_field_->SetBackgroundColor(text_area_background);
-  size_value_field_->SetReadOnly(true);
-  size_value_field_->RemoveBorder();
-  size_value_field_->SetBackgroundColor(text_area_background);
-  last_modified_value_field_->SetReadOnly(true);
-  last_modified_value_field_->RemoveBorder();
-  last_modified_value_field_->SetBackgroundColor(text_area_background);
+  host_value_field_->SetReadOnly(true);
+  host_value_field_->RemoveBorder();
+  host_value_field_->SetBackgroundColor(text_area_background);
+  key_value_field_->SetReadOnly(true);
+  key_value_field_->RemoveBorder();
+  key_value_field_->SetBackgroundColor(text_area_background);
+  value_value_field_->SetReadOnly(true);
+  value_value_field_->RemoveBorder();
+  value_value_field_->SetBackgroundColor(text_area_background);
 }