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

chrome/browser/ui/views/website_settings/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/website_settings_popup_view.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 291 matching lines @@
     NOTREACHED();
   }
 
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(gfx::Insets(
       GetLayoutConstant(LOCATION_BAR_BUBBLE_ANCHOR_VERTICAL_INSET), 0));
 
   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);
   label->SetAllowCharacterBreak(true);
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   AddChildView(label);
 
   views::BubbleDialogDelegateView::CreateBubble(this);
 }
 
@@ skipping 434 matching lines @@
           WebsiteSettings::WEBSITE_SETTINGS_CONNECTION_HELP_OPENED);
       break;
     case STYLED_LABEL_RESET_CERTIFICATE_DECISIONS:
       presenter_->OnRevokeSSLErrorBypassButtonPressed();
       GetWidget()->Close();
       break;
     default:
       NOTREACHED();
   }
 }