Add icons to the views Website Settings UI.

chrome/browser/ui/views/website_settings_popup_view.cc

 // Copyright (c) 2012 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/ui/views/website_settings_popup_view.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/website_settings/website_settings.h"
 #include "chrome/browser/ui/views/collected_cookies_views.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/content_settings_types.h"
 #include "content/public/browser/cert_store.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_resources_standard.h"
+#include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/combobox/combobox.h"
+#include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/view.h"
 
 namespace {
 
 // In order to make the arrow of the bubble point directly at the location icon
 // in the Omnibox rather then the bottom border of the Omnibox, the position of
 // the bubble must be adjusted. This is the number of pixel the bubble must be
 // moved towards the top of the screen (starting from the bottom border of the
 // Omnibox).
 const int kLocationIconBottomMargin = 5;
 
 // Font size of the label for the site identity.
 const int kIdentityNameFontSize = 14;
 // The text color that is used for the site identity status text, if the site's
 // identity was sucessfully verified.
 const int kIdentityVerifiedTextColor = 0xFF298a27;
 
+// Left icon margin.
+const int kIconMarginLeft = 6;
+
 // Margin and padding values for the |PopupHeader|.
 const int kHeaderMarginBottom = 10;
 const int kHeaderPaddingBottom = 12;
 const int kHeaderPaddingLeft = 10;
 const int kHeaderPaddingRight = 8;
 const int kHeaderPaddingTop = 8;
 
 // Spacing between the site identity label and the site identity status text in
 // the popup header.
 const int kHeaderRowSpacing = 4;
 
 // Padding values for sections.
 const int kSectionPaddingBottom = 6;
 const int kSectionPaddingLeft = 10;
 const int kSectionPaddingTop = 14;
 
 // Space between a section headline and the section content.
 const int kSectionHeadlineMarginBottom = 10;
 // The content of the "Permissions" section and of the "Cookies and Site Data"
 // section, is structured in individual rows. |kSectionRowSpaceing| is the
 // space between these rows.
 const int kSectionRowSpacing = 6;
 
+// The width of the column that contains the permissions icons.
+const int kPermissionIconColumnWidth = 20;
+// Left margin of the label that displays the permission types.
+const int kPermissionsRowLabelMarginLeft = 8;
+
 // The max width of the popup.
 const int kPopupWidth = 300;
 
 // The bottom margin of the tabbed pane view.
 const int kTabbedPaneMarginBottom = 8;
 
 string16 PermissionTypeToString(ContentSettingsType type) {
   return l10n_util::GetStringUTF16(
       WebsiteSettingsUI::PermissionTypeToUIStringID(type));
 }
@@ skipping 61 matching lines @@
 }
 
 ContentSetting PermissionComboboxModel::GetSettingAt(int index) const {
   if (index < static_cast<int>(settings_.size()))
     return settings_[index];
   NOTREACHED();
   return CONTENT_SETTING_DEFAULT;
 }
 
 int PermissionComboboxModel::GetItemCount() const {
- return settings_.size();
+  return settings_.size();
 }
 
 string16 PermissionComboboxModel::GetItemAt(int index) {
   if (index == 0) {
     return l10n_util::GetStringFUTF16(
         IDS_WEBSITE_SETTINGS_DEFAULT_PERMISSION_LABEL,
         PermissionValueToString(default_setting_));
   }
   if (index < static_cast<int>(settings_.size())) {
     return l10n_util::GetStringFUTF16(
@@ skipping 125 matching lines @@
     TabContents* tab_contents,
     const GURL& url,
     const content::SSLStatus& ssl)
     : BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_LEFT),
       tab_contents_(tab_contents),
       header_(NULL),
       tabbed_pane_(NULL),
       site_data_content_(NULL),
       cookie_dialog_link_(NULL),
       permissions_content_(NULL),
-      identity_info_text_(NULL),
-      connection_info_text_(NULL),
-      page_info_text_(NULL) {
+      identity_info_content_(NULL),
+      connection_info_content_(NULL),
+      page_info_content_(NULL) {
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
   const int content_column = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(content_column);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
                         views::GridLayout::USE_PREF,
                         0,
                         0);
@@ skipping 40 matching lines @@
 
   const int site_data_content_column = 0;
   views::ColumnSet* column_set =
       layout->AddColumnSet(site_data_content_column);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
                         views::GridLayout::USE_PREF,
                         0,
                         0);
+  column_set->AddPaddingColumn(0, kIconMarginLeft);
+  column_set->AddColumn(views::GridLayout::FILL,
+                        views::GridLayout::FILL,
+                        1,
+                        views::GridLayout::USE_PREF,
+                        0,
+                        0);
 
   for (CookieInfoList::const_iterator it = cookie_info_list.begin();
        it != cookie_info_list.end();
        ++it) {
     string16 label_text = l10n_util::GetStringFUTF16(
         IDS_WEBSITE_SETTINGS_SITE_DATA_STATS_LINE,
         UTF8ToUTF16(it->cookie_source),
         base::IntToString16(it->allowed),
         base::IntToString16(it->allowed));
     layout->StartRow(1, site_data_content_column);
+    views::ImageView* icon = new views::ImageView();
+    const gfx::Image& image = WebsiteSettingsUI::GetPermissionIcon(
+        CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_ALLOW);
+    icon->SetImage(image.ToImageSkia());
+    layout->AddView(icon);
     layout->AddView(new views::Label(label_text),
                     1,
                     1,
                     views::GridLayout::LEADING,
                     views::GridLayout::CENTER);
 
     layout->AddPaddingRow(1, kSectionRowSpacing);
   }
 
   layout->Layout(site_data_content_);
@@ skipping 39 matching lines @@
         break;
       case CONTENT_SETTING_BLOCK:
         combobox->SetSelectedIndex(2);
         break;
       default:
         combobox->SetSelectedIndex(4);
         break;
     }
     combobox->set_listener(this);
 
+    views::ImageView* icon = new views::ImageView();
+    ContentSetting setting = permission->setting;
+    if (setting == CONTENT_SETTING_DEFAULT)
+      setting = permission->default_setting;
+    const gfx::Image& image = WebsiteSettingsUI::GetPermissionIcon(
+        permission->type, setting);
+    icon->SetImage(image.ToImageSkia());
+
     layout->StartRow(1, content_column);
-    layout->AddView(CreatePermissionRow(label, combobox),
+    layout->AddView(CreatePermissionRow(icon, label, combobox),
                     1,
                     1,
                     views::GridLayout::LEADING,
                     views::GridLayout::CENTER);
 
     layout->AddPaddingRow(1, kSectionRowSpacing);
   }
 
   SizeToContents();
 }
@@ skipping 11 matching lines @@
       text_color = kIdentityVerifiedTextColor;
       break;
     default:
       identity_status_text =
          l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_IDENTITY_NOT_VERIFIED);
       break;
   }
   header_->SetIdentityName(UTF8ToUTF16(identity_info.site_identity));
   header_->SetIdentityStatus(identity_status_text, text_color);
 
-  identity_info_text_->SetText(
+  ResetContentContainer(
+      identity_info_content_,
+      WebsiteSettingsUI::GetIdentityIcon(identity_info.identity_status),
       UTF8ToUTF16(identity_info.identity_status_description));
-
-  connection_info_text_->SetText(
+  ResetContentContainer(
+      connection_info_content_,
+      WebsiteSettingsUI::GetConnectionIcon(identity_info.connection_status),
       UTF8ToUTF16(identity_info.connection_status_description));
 
+  // Layout.
   GetLayoutManager()->Layout(this);
   SizeToContents();
 }
+
+void WebsiteSettingsPopupView::SetFirstVisit(const string16& first_visit) {
+  // TODO(markusheintz): Display a minor warning icon if the page is visited
+  // the first time.
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ResetContentContainer(
+      page_info_content_,
+      rb.GetImageNamed(IDR_PAGEINFO_INFO),
+      first_visit);
+
+  // Layout.
+  GetLayoutManager()->Layout(this);
+  SizeToContents();
+}
 
 gfx::Size WebsiteSettingsPopupView::GetPreferredSize() {
   int height = 0;
   if (header_)
     height += header_->GetPreferredSize().height();
   if (tabbed_pane_)
     height += tabbed_pane_->GetPreferredSize().height();
 
   return gfx::Size(kPopupWidth, height);
 }
 
-void WebsiteSettingsPopupView::SetFirstVisit(const string16& first_visit) {
-  page_info_text_->SetText(first_visit);
-}
-
 gfx::Rect WebsiteSettingsPopupView::GetAnchorRect() {
   // Compensate for some built-in padding in the icon. This will make the arrow
   // point to the middle of the icon.
   gfx::Rect anchor(BubbleDelegateView::GetAnchorRect());
   anchor.Inset(0, anchor_view() ? kLocationIconBottomMargin : 0);
   return anchor;
 }
 
 void WebsiteSettingsPopupView::OnSelectedIndexChanged(
     views::Combobox* combobox) {
@@ skipping 61 matching lines @@
   section_content->SetLayoutManager(layout);
   const int content_column = 0;
   views::ColumnSet* column_set =
       layout->AddColumnSet(content_column);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
                         views::GridLayout::USE_PREF,
                         0,
                         0);
-  identity_info_text_ = CreateTextLabel(string16());
+  identity_info_content_ = new views::View();
   layout->StartRow(1, content_column);
-  layout->AddView(identity_info_text_, 1, 1, views::GridLayout::LEADING,
+  layout->AddView(identity_info_content_, 1, 1, views::GridLayout::LEADING,
                   views::GridLayout::CENTER);
   views::View* section =
       CreateSection(l10n_util::GetStringUTF16(
                         IDS_WEBSITE_SETTINGS_TITEL_IDENTITY),
                     section_content,
                     NULL);
   pane->AddChildView(section);
 
   // Add connection section.
-  section_content = new views::View();
-  layout = new views::GridLayout(section_content);
-  section_content->SetLayoutManager(layout);
-  column_set = layout->AddColumnSet(content_column);
-  column_set->AddColumn(views::GridLayout::FILL,
-                        views::GridLayout::FILL,
-                        1,
-                        views::GridLayout::USE_PREF,
-                        0,
-                        0);
-  connection_info_text_ = CreateTextLabel(string16());
-  layout->StartRow(1, content_column);
-  layout->AddView(connection_info_text_, 1, 1, views::GridLayout::LEADING,
-                  views::GridLayout::CENTER);
+  connection_info_content_ = new views::View();
   section = CreateSection(l10n_util::GetStringUTF16(
                               IDS_WEBSITE_SETTINGS_TITEL_CONNECTION),
-                          section_content,
+                          connection_info_content_,
                           NULL);
   pane->AddChildView(section);
 
   // Add page info section.
   section_content = new views::View();
   layout = new views::GridLayout(section_content);
   section_content->SetLayoutManager(layout);
   column_set = layout->AddColumnSet(content_column);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
                         views::GridLayout::USE_PREF,
                         0,
                         0);
-  page_info_text_ = CreateTextLabel(string16());
+  page_info_content_ = new views::View();
   layout->StartRow(1, content_column);
-  layout->AddView(page_info_text_, 1, 1, views::GridLayout::LEADING,
+  layout->AddView(page_info_content_, 1, 1, views::GridLayout::LEADING,
                   views::GridLayout::CENTER);
   section = CreateSection(l10n_util::GetStringUTF16(
                               IDS_PAGE_INFO_SITE_INFO_TITLE),
                           section_content,
                           NULL);
   pane->AddChildView(section);
 
   return pane;
 }
 
@@ skipping 30 matching lines @@
     layout->AddPaddingRow(1, 4);
     layout->StartRow(1, content_column);
     layout->AddView(link, 1, 1, views::GridLayout::LEADING,
                     views::GridLayout::CENTER);
   }
 
   layout->AddPaddingRow(1, kSectionPaddingBottom);
   return container;
 }
 
+void WebsiteSettingsPopupView::ResetContentContainer(
+    views::View* content_container,
+    const gfx::Image& icon,
+    const string16& text) {
+  views::ImageView* icon_view = new views::ImageView();
+  icon_view->SetImage(icon.ToImageSkia());
+  views::Label* label = new views::Label(text);
+  label->SetMultiLine(true);
+  label->SetAllowCharacterBreak(true);
+  label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+
+  content_container->RemoveAllChildViews(true);
+  views::GridLayout* layout = new views::GridLayout(content_container);
+  content_container->SetLayoutManager(layout);
+  views::ColumnSet* column_set = layout->AddColumnSet(0);
+  column_set->AddColumn(views::GridLayout::FILL,
+                        views::GridLayout::FILL,
+                        0,
+                        views::GridLayout::USE_PREF,
+                        0,
+                        0);
+  column_set->AddPaddingColumn(0, kIconMarginLeft);
+  column_set->AddColumn(views::GridLayout::FILL,
+                        views::GridLayout::FILL,
+                        1,
+                        views::GridLayout::USE_PREF,
+                        0,
+                        0);
+
+  layout->StartRow(1, 0);
+  layout->AddView(icon_view, 1, 1, views::GridLayout::LEADING,
+                  views::GridLayout::LEADING);
+  layout->AddView(label, 1, 1, views::GridLayout::LEADING,
+                  views::GridLayout::LEADING);
+}
+
 views::View* WebsiteSettingsPopupView::CreatePermissionRow(
+    views::ImageView* icon,
     views::Label* label,
     views::Combobox* combobox) {
   views::View* container = new views::View();
   views::GridLayout* layout = new views::GridLayout(container);
   container->SetLayoutManager(layout);
   const int two_column_layout = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(two_column_layout);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
+                        views::GridLayout::FIXED,
+                        kPermissionIconColumnWidth,
+                        0);
+  column_set->AddPaddingColumn(0, kIconMarginLeft);
+  column_set->AddColumn(views::GridLayout::FILL,
+                        views::GridLayout::FILL,
+                        1,
                         views::GridLayout::USE_PREF,
                         0,
                         0);
-  column_set->AddPaddingColumn(0, 8);
+  column_set->AddPaddingColumn(0, kPermissionsRowLabelMarginLeft);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
                         views::GridLayout::USE_PREF,
                         0,
                         0);
 
   layout->StartRow(1, two_column_layout);
-  layout->AddView(label);
+
+  layout->AddView(icon, 1, 1, views::GridLayout::CENTER,
+                  views::GridLayout::CENTER);
+  layout->AddView(label, 1,1, views::GridLayout::LEADING,
+                  views::GridLayout::CENTER);
   layout->AddView(combobox);
   return container;
 }
-
-views::Label* WebsiteSettingsPopupView::CreateTextLabel(const string16& text) {
-  views::Label* label = new views::Label(text);
-  label->SetMultiLine(true);
-  label->SetAllowCharacterBreak(true);
-  label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
-  return label;
-}