[WebsiteSettings] UI updates for the permissions bubble.

chrome/browser/ui/views/website_settings/permissions_bubble_view.cc

 // Copyright 2014 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/permissions_bubble_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/website_settings/permission_selector_view.h"
 #include "chrome/browser/ui/views/website_settings/permission_selector_view_observer.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
@@ skipping 13 matching lines @@
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 
 namespace {
 
 // Spacing constant for outer margin. This is added to the
-// bubble margin itself to equalize the margins at 20px.
-const int kBubbleOuterMargin = 12;
+// bubble margin itself to equalize the margins at 13px.
+const int kBubbleOuterMargin = 5;
 
-// Spacing between major items should be 10px.
-const int kItemMajorSpacing = 10;
+// Spacing between major items should be 9px.
+const int kItemMajorSpacing = 9;
 
 // Button border size, draws inside the spacing distance.
 const int kButtonBorderSize = 2;
 
+// (Square) pixel size of icon.
+const int kIconSize = 18;
+
+// Number of pixels to indent the permission request labels.
+const int kPermissionIndentSpacing = 12;
+
 }  // namespace
 
 // This class is a MenuButton which is given a PermissionMenuModel. It
 // shows the current checked item in the menu model, and notifies its listener
 // about any updates to the state of the selection.
 // TODO: refactor PermissionMenuButton to work like this and re-use?
 class PermissionCombobox : public views::MenuButton,
                            public views::MenuButtonListener {
  public:
   // Get notifications when the selection changes.
@@ skipping 102 matching lines @@
   else
     return l10n_util::GetStringUTF16(IDS_PERMISSION_CUSTOMIZE);
 }
 
 int CustomizeAllowComboboxModel::GetDefaultIndex() const {
   return INDEX_ALLOW;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // View implementation for the permissions bubble.
-
 class PermissionsBubbleDelegateView : public views::BubbleDelegateView,
                                       public views::ButtonListener,
                                       public views::ComboboxListener,
                                       public PermissionCombobox::Listener {
  public:
   PermissionsBubbleDelegateView(
       views::View* anchor,
       PermissionBubbleViewViews* owner,
       const std::vector<PermissionBubbleRequest*>& requests,
       const std::vector<bool>& accept_state,
       bool customization_mode);
   virtual ~PermissionsBubbleDelegateView();
 
   void Close();
   void SizeToContents();
 
   // BubbleDelegateView:
   virtual bool ShouldShowCloseButton() const OVERRIDE;
   virtual bool ShouldShowWindowTitle() const OVERRIDE;
+  virtual const gfx::FontList& GetTitleFontList() const OVERRIDE;
   virtual base::string16 GetWindowTitle() const OVERRIDE;
   virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
 
   // ButtonListener:
   virtual void ButtonPressed(views::Button* button,
                              const ui::Event& event) OVERRIDE;
 
   // ComboboxListener:
   virtual void OnPerformAction(views::Combobox* combobox) OVERRIDE;
 
@@ skipping 27 matching lines @@
   DCHECK(!requests.empty());
 
   RemoveAllChildViews(true);
   customize_comboboxes_.clear();
   set_close_on_esc(false);
   set_close_on_deactivate(false);
 
   SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kVertical, kBubbleOuterMargin, 0, kItemMajorSpacing));
 
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-
   // TODO(gbillock): account for different requests from different hosts.
   hostname_ = requests[0]->GetRequestingHostname().host();
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   for (size_t index = 0; index < requests.size(); index++) {
     DCHECK(index < accept_state.size());
     // The row is laid out containing a leading-aligned label area and a
     // trailing column which will be filled during customization with a
     // combobox.
     views::View* row = new views::View();
     views::GridLayout* row_layout = new views::GridLayout(row);
     row->SetLayoutManager(row_layout);
     views::ColumnSet* columns = row_layout->AddColumnSet(0);
     columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::FILL,
                        0, views::GridLayout::USE_PREF, 0, 0);
     columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::FILL,
                        100, views::GridLayout::USE_PREF, 0, 0);
     row_layout->StartRow(0, 0);
 
     views::View* label_container = new views::View();
     label_container->SetLayoutManager(
-        new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 5));
+        new views::BoxLayout(views::BoxLayout::kHorizontal,
+                             kPermissionIndentSpacing,
+                             0, kBubbleOuterMargin));
     views::ImageView* icon = new views::ImageView();
     icon->SetImage(bundle.GetImageSkiaNamed(requests.at(index)->GetIconID()));
+    icon->SetImageSize(gfx::Size(kIconSize, kIconSize));
     label_container->AddChildView(icon);
     views::Label* label =
         new views::Label(requests.at(index)->GetMessageTextFragment());
-    label->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
     label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     label_container->AddChildView(label);
     row_layout->AddView(label_container);
 
     if (customization_mode) {
       PermissionCombobox* combobox = new PermissionCombobox(
           this,
           index,
           requests[index]->GetRequestingHostname(),
           accept_state[index] ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
@@ skipping 37 matching lines @@
   button_layout->StartRow(0, 0);
 
   // Allow button is a regular button when there's only one option, and a
   // STYLE_ACTION Combobox when there are more than one option and
   // customization is an option.
 
   base::string16 allow_text = l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW);
   if (requests.size() == 1) {
     views::LabelButton* allow_button = new views::LabelButton(this, allow_text);
     allow_button->SetStyle(views::Button::STYLE_BUTTON);
-    allow_button->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
     button_layout->AddView(allow_button);
     allow_ = allow_button;
   } else {
     views::Combobox* allow_combobox = new views::Combobox(
         new CustomizeAllowComboboxModel());
     allow_combobox->set_listener(this);
     allow_combobox->SetStyle(views::Combobox::STYLE_ACTION);
     button_layout->AddView(allow_combobox);
     allow_combobox_ = allow_combobox;
   }
 
   base::string16 deny_text = l10n_util::GetStringUTF16(IDS_PERMISSION_DENY);
   views::LabelButton* deny_button = new views::LabelButton(this, deny_text);
   deny_button->SetStyle(views::Button::STYLE_BUTTON);
-  deny_button->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
   button_layout->AddView(deny_button);
   deny_ = deny_button;
 
   button_layout->AddPaddingRow(0, kBubbleOuterMargin);
 }
 
 PermissionsBubbleDelegateView::~PermissionsBubbleDelegateView() {
   if (owner_)
     owner_->Closing();
 }
 
 void PermissionsBubbleDelegateView::Close() {
   owner_ = NULL;
   GetWidget()->Close();
 }
 
 bool PermissionsBubbleDelegateView::ShouldShowCloseButton() const {
   return true;
 }
 
 bool PermissionsBubbleDelegateView::ShouldShowWindowTitle() const {
   return true;
 }
 
+const gfx::FontList& PermissionsBubbleDelegateView::GetTitleFontList() const {
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  return rb.GetFontList(ui::ResourceBundle::BaseFont);
+}
+
 base::string16 PermissionsBubbleDelegateView::GetWindowTitle() const {
   if (!title_.empty()) {
     return title_;
   }
 
   return l10n_util::GetStringFUTF16(IDS_PERMISSIONS_BUBBLE_PROMPT,
                                     base::UTF8ToUTF16(hostname_));
 }
 
 void PermissionsBubbleDelegateView::SizeToContents() {
@@ skipping 97 matching lines @@
 
 void PermissionBubbleViewViews::Deny() {
   if (delegate_)
     delegate_->Deny();
 }
 
 void PermissionBubbleViewViews::SetCustomizationMode() {
   if (delegate_)
     delegate_->SetCustomizationMode();
 }