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

components/omnibox/browser/omnibox_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.
 
 // This file defines helper functions shared by the various implementations
 // of OmniboxView.
 
 #include "components/omnibox/browser/omnibox_view.h"
 
 #include "base/strings/string16.h"
@@ skipping 63 matching lines @@
 }
 
 int OmniboxView::GetIcon() const {
   if (!IsEditingOrEmpty())
     return controller_->GetToolbarModel()->GetIcon();
   int id = AutocompleteMatch::TypeToIcon(model_.get() ?
       model_->CurrentTextType() : AutocompleteMatchType::URL_WHAT_YOU_TYPED);
   return (id == IDR_OMNIBOX_HTTP) ? IDR_LOCATION_BAR_HTTP : id;
 }
 
-gfx::VectorIconId OmniboxView::GetVectorIcon() const {
+gfx::VectorIconId OmniboxView::GetVectorIcon(bool invert) const {
 #if !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_IOS)
-  if (!IsEditingOrEmpty())
-    return controller_->GetToolbarModel()->GetVectorIcon();
+  if (!IsEditingOrEmpty()) {
+    gfx::VectorIconId id = controller_->GetToolbarModel()->GetVectorIcon();
+    if (!invert)
+      return id;
+
+    switch (id) {
+      case gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID:
+        return gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID_INVERT;
+      case gfx::VectorIconId::LOCATION_BAR_HTTPS_INVALID:
+        return gfx::VectorIconId::LOCATION_BAR_HTTPS_INVALID_INVERT;
+
+      default:
+        return id;
+    }

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

Nit: Shorter:

    gfx::VectorIconId id = controller_->GetToolbarModel()->GetVectorIcon();
    if (invert) {
      if (id == gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID)
        return gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID_INVERT;
      if (id == gfx::VectorIconId::LOCATION_BAR_HTTPS_INVALID)
        return gfx::VectorIconId::LOCATION_BAR_HTTPS_INVALID_INVERT;
    }
    return id;

+  }
   // Reuse the dropdown icons...
   gfx::VectorIconId id = AutocompleteMatch::TypeToVectorIcon(
       model_ ? model_->CurrentTextType()
              : AutocompleteMatchType::URL_WHAT_YOU_TYPED);
   // but use a tweaked version for the HTTP icon.
   return (id == gfx::VectorIconId::OMNIBOX_HTTP)
              ? gfx::VectorIconId::LOCATION_BAR_HTTP
              : id;
 #else
   NOTIMPLEMENTED();
@@ skipping 72 matching lines @@
     model_.reset(
         new OmniboxEditModel(this, controller, client.Pass()));
   }
 }
 
 void OmniboxView::TextChanged() {
   EmphasizeURLComponents();
   if (model_.get())
     model_->OnChanged();
 }