[MD] update EV bubble icon and location bar https icons

chrome/browser/ui/views/location_bar/location_bar_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/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/i18n/rtl.h"
@@ skipping 321 matching lines @@
       return ui::MaterialDesignController::IsModeMaterial()
                  ? gfx::kGoogleGreen700
                  : SkColorSetRGB(7, 149, 0);
   }
   NOTREACHED();
   return gfx::kPlaceholderColor;
 }
 
 SkColor LocationBarView::GetSecureTextColor(
     SecurityStateModel::SecurityLevel security_level) const {
-  bool inverted =
-      color_utils::GetLuminanceForColor(GetColor(BACKGROUND)) < 128;
+  bool inverted = color_utils::IsDark(GetColor(BACKGROUND));
   SkColor color;
   switch (security_level) {
     case SecurityStateModel::EV_SECURE:
     case SecurityStateModel::SECURE:
       if (ui::MaterialDesignController::IsModeMaterial() && inverted)
         return GetColor(TEXT);
       color = GetColor(EV_BUBBLE_TEXT_AND_BORDER);
       break;
 
     case SecurityStateModel::SECURITY_POLICY_WARNING:
@@ skipping 431 matching lines @@
         location_bounds.right(), location_bounds.y(),
         std::min(width, entry_width), location_bounds.height());
   }
   omnibox_view_->SetBoundsRect(location_bounds);
 }
 
 void LocationBarView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   if (!ui::MaterialDesignController::IsModeMaterial())
     return;
 
+  RefreshLocationIcon();
   set_background(new BackgroundWith1PxBorder(
       GetColor(BACKGROUND), SkColorSetARGB(0x4D, 0x00, 0x00, 0x00),
       is_popup_mode_));
 }
 
 void LocationBarView::Update(const WebContents* contents) {
   RefreshContentSettingViews();
   RefreshZoomView();
   RefreshPageActionViews();
   RefreshTranslateIcon();
@@ skipping 56 matching lines @@
 int LocationBarView::GetVerticalEdgeThickness() const {
   return is_popup_mode_ ? kPopupEdgeThickness
                         : GetLayoutConstant(LOCATION_BAR_BORDER_THICKNESS);
 }
 
 int LocationBarView::VerticalPadding() const {
   return is_popup_mode_ ?
       kPopupEdgeThickness : GetLayoutConstant(LOCATION_BAR_VERTICAL_PADDING);
 }
 
+void LocationBarView::RefreshLocationIcon() {
+  // |omnibox_view_| may not be ready yet.

[Peter Kasting, 2015/11/17 21:27:03]

If you really need this conditional, this comment might be better as something
like "This can be called before LocationBarView::Init(), in which case we can
just ignore it; OnChanged() will call us shortly and we can set the correct icon
then."

(I don't love this wording, I'm just trying to get the general idea across.)

[Evan Stade, 2015/11/17 22:57:21]

Done.

+  if (!omnibox_view_)
+    return;
+
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    location_icon_view_->SetImage(gfx::CreateVectorIcon(
+        omnibox_view_->GetVectorIcon(color_utils::IsDark(GetColor(BACKGROUND))),
+        16, color_utils::DeriveDefaultIconColor(GetColor(TEXT))));
+  } else {
+    location_icon_view_->SetImage(
+        *GetThemeProvider()->GetImageSkiaNamed(omnibox_view_->GetIcon()));
+  }
+}
+
 bool LocationBarView::RefreshContentSettingViews() {
   bool visibility_changed = false;
   for (ContentSettingViews::const_iterator i(content_setting_views_.begin());
        i != content_setting_views_.end(); ++i) {
     const bool was_visible = (*i)->visible();
     (*i)->Update(GetToolbarModel()->input_in_progress() ?
         NULL : GetWebContents());
     if (was_visible != (*i)->visible())
       visibility_changed = true;
   }
@@ skipping 469 matching lines @@
 }
 
 void LocationBarView::AnimationEnded(const gfx::Animation* animation) {
   browser_->window()->ToolbarSizeChanged(false);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, private OmniboxEditController implementation:
 
 void LocationBarView::OnChanged() {
-  location_icon_view_->SetImage(
-      ui::MaterialDesignController::IsModeMaterial()
-          ? gfx::CreateVectorIcon(omnibox_view_->GetVectorIcon(), 16,
-                                  gfx::kChromeIconGrey)
-          : *GetThemeProvider()->GetImageSkiaNamed(omnibox_view_->GetIcon()));
+  RefreshLocationIcon();
   location_icon_view_->ShowTooltip(!GetOmniboxView()->IsEditingOrEmpty());
 
   Layout();
   SchedulePaint();
 }
 
 void LocationBarView::OnSetFocus() {
   GetFocusManager()->SetFocusedView(this);
 }
 
@@ skipping 16 matching lines @@
 // LocationBarView, private TemplateURLServiceObserver implementation:
 
 void LocationBarView::OnTemplateURLServiceChanged() {
   template_url_service_->RemoveObserver(this);
   template_url_service_ = NULL;
   // If the browser is no longer active, let's not show the info bubble, as this
   // would make the browser the active window again.
   if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive())
     ShowFirstRunBubble();
 }