Harmony - Remove icon from internal page info dialog view in Material Design mode.

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

Index: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
index 707d035b8eb6f1f2505c2f4e0f21ba351c98ffbb..a9bdf2828b00c5af1e41ab5b149da48ebba1e52a 100644
--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
+++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
@@ -309,10 +309,14 @@ InternalPageInfoPopupView::InternalPageInfoPopupView(
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal, kSpacing,
                                         kSpacing, kSpacing));
   set_margins(gfx::Insets());
-  views::ImageView* icon_view = new NonAccessibleImageView();
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  icon_view->SetImage(rb.GetImageSkiaNamed(icon));
-  AddChildView(icon_view);
+  // This will change to 'if (LayoutDelegate::Get()->ShouldShowWindowIcon())'
+  // once CL https://codereview.chromium.org/2746223002 has landed.

[benwells, 2017/03/14 23:19:57]

Nit: it's a bit weird to reference CLs in code, e.g. the CL you're referencing
might get closed for reasons. Instead I'd just put a TODO: change to '....'.

+  if (!ui::MaterialDesignController::IsSecondaryUiMaterial()) {
+    views::ImageView* icon_view = new NonAccessibleImageView();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    icon_view->SetImage(rb.GetImageSkiaNamed(icon));
+    AddChildView(icon_view);
+  }
 
   views::Label* label = new views::Label(l10n_util::GetStringUTF16(text));
   label->SetMultiLine(true);