Use vector image resources in extension install dialog.

chrome/browser/ui/views/extensions/extension_install_dialog_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/extensions/extension_install_dialog_view.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_urls.h"
-#include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/text_utils.h"
+#include "ui/gfx/vector_icons_public2.h"
+#include "ui/native_theme/common_theme.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
@@ skipping 479 matching lines @@
   layout->AddView(title);
 
   // Scale down to icon size, but allow smaller icons (don't scale up).
   const gfx::ImageSkia* image = prompt_->icon().ToImageSkia();
   gfx::Size size(image->width(), image->height());
   if (size.width() > kIconSize || size.height() > kIconSize)
     size = gfx::Size(kIconSize, kIconSize);
   views::ImageView* icon = new views::ImageView();
   icon->SetImageSize(size);
   icon->SetImage(*image);
-  icon->SetHorizontalAlignment(views::ImageView::CENTER);

[Evan Stade, 2015/08/10 17:13:40]

unrelated, but these are already the defaults

-  icon->SetVerticalAlignment(views::ImageView::CENTER);
 
   int icon_row_span = 1;  // Always span the title.
   if (prompt_->has_webstore_data()) {
     // Also span the rating, user_count and store_link rows.
     icon_row_span += 3;
     // Note: Do not span the permissions here, there's a separator in between!
   } else {
     // Also span the scrollable container with permissions, retained files etc.
     icon_row_span += 1;
   }
@@ skipping 171 matching lines @@
     return;
 
   details_view_ = new DetailsView(horizontal_space, parent_bulleted);
 
   layout->StartRow(0, column_set_id);
   layout->AddView(details_view_);
 
   for (size_t i = 0; i < details.size(); ++i)
     details_view_->AddDetail(details[i]);
 
-  views::Link* link = new views::Link(
-      l10n_util::GetStringUTF16(IDS_EXTENSIONS_SHOW_DETAILS));
-
   // Make sure the link width column is as wide as needed for both Show and
   // Hide details, so that the arrow doesn't shift horizontally when we
   // toggle.
-  int link_col_width =
-      views::kRelatedControlHorizontalSpacing +
-      std::max(gfx::GetStringWidth(

[Evan Stade, 2015/08/10 17:13:40]

this was buggy; it neglects insets but papers over it with the
views::kRelatedControlHorizontalSpacing padding.

-                   l10n_util::GetStringUTF16(IDS_EXTENSIONS_HIDE_DETAILS),
-                   link->font_list()),
-               gfx::GetStringWidth(
-                   l10n_util::GetStringUTF16(IDS_EXTENSIONS_SHOW_DETAILS),
-                   link->font_list()));
+  views::Link* link = new views::Link(
+      l10n_util::GetStringUTF16(IDS_EXTENSIONS_HIDE_DETAILS));
+  int link_col_width = link->GetPreferredSize().width();
+  link->SetText(l10n_util::GetStringUTF16(IDS_EXTENSIONS_SHOW_DETAILS));
+  link_col_width = std::max(link_col_width, link->GetPreferredSize().width());
 
   column_set = layout->AddColumnSet(++column_set_id);
   // Padding to the left of the More Details column. If the parent is using
   // bullets for its items, then a padding of one unit will make the child
   // item (which has no bullet) look like a sibling of its parent. Therefore
   // increase the indentation by one more unit to show that it is in fact a
   // child item (with no missing bullet) and not a sibling.
   column_set->AddPaddingColumn(
       0, views::kRelatedControlHorizontalSpacing * (parent_bulleted ? 2 : 1));
   // The More Details column.
   column_set->AddColumn(views::GridLayout::LEADING,
                         views::GridLayout::LEADING,
                         0,
                         views::GridLayout::FIXED,
                         link_col_width,
                         link_col_width);
   // The Up/Down arrow column.
   column_set->AddColumn(views::GridLayout::LEADING,
-                        views::GridLayout::LEADING,
+                        views::GridLayout::TRAILING,
                         0,
                         views::GridLayout::USE_PREF,
                         0,
                         0);
 
   // Add the More Details link.
   layout->StartRow(0, column_set_id);
   more_details_ = link;
   more_details_->set_listener(this);
   more_details_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   layout->AddView(more_details_);
 
   // Add the arrow after the More Details link.
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   arrow_toggle_ = new views::ImageButton(this);
-  arrow_toggle_->SetImage(views::Button::STATE_NORMAL,
-                          rb.GetImageSkiaNamed(IDR_DOWN_ARROW));
+  UpdateArrowToggle(false);
   layout->AddView(arrow_toggle_);
 }
 
 ExpandableContainerView::~ExpandableContainerView() {
 }
 
 void ExpandableContainerView::ButtonPressed(
     views::Button* sender, const ui::Event& event) {
   ToggleDetailLevel();
 }
 
 void ExpandableContainerView::LinkClicked(
     views::Link* source, int event_flags) {
   ToggleDetailLevel();
 }
 
 void ExpandableContainerView::AnimationProgressed(
     const gfx::Animation* animation) {
   DCHECK_EQ(&slide_animation_, animation);
   if (details_view_)
     details_view_->AnimateToState(animation->GetCurrentValue());
 }
 
 void ExpandableContainerView::AnimationEnded(const gfx::Animation* animation) {
-  if (arrow_toggle_) {
-    if (animation->GetCurrentValue() != 0.0) {
-      arrow_toggle_->SetImage(
-          views::Button::STATE_NORMAL,
-          ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-              IDR_UP_ARROW));
-    } else {
-      arrow_toggle_->SetImage(
-          views::Button::STATE_NORMAL,
-          ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-              IDR_DOWN_ARROW));
-    }
-  }
+  if (arrow_toggle_)
+    UpdateArrowToggle(animation->GetCurrentValue() != 0.0);
   if (more_details_) {
     more_details_->SetText(expanded_ ?
         l10n_util::GetStringUTF16(IDS_EXTENSIONS_HIDE_DETAILS) :
         l10n_util::GetStringUTF16(IDS_EXTENSIONS_SHOW_DETAILS));
   }
 }
 
 void ExpandableContainerView::ChildPreferredSizeChanged(views::View* child) {
   PreferredSizeChanged();
 }
 
 void ExpandableContainerView::ToggleDetailLevel() {
   expanded_ = !expanded_;
 
   if (slide_animation_.IsShowing())
     slide_animation_.Hide();
   else
     slide_animation_.Show();
 }
 
+void ExpandableContainerView::UpdateArrowToggle(bool expanded) {
+  SkColor icon_color;
+  ui::CommonThemeGetSystemColor(ui::NativeTheme::kColorId_ChromeIconGrey,
+                                &icon_color);
+  gfx::ImageSkia icon = gfx::CreateVectorIcon(expanded ?
+          gfx::VectorIconId::FIND_PREV :
+          gfx::VectorIconId::FIND_NEXT,
+          16,
+          icon_color);
+  arrow_toggle_->SetImage(
+      views::Button::STATE_NORMAL,
+      &icon);
+}
+
 // static
 ExtensionInstallPrompt::ShowDialogCallback
 ExtensionInstallPrompt::GetDefaultShowDialogCallback() {
   return base::Bind(&ShowExtensionInstallDialogImpl);
 }