Convert location bar decorations to Material Design (Mac).

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 <utility>
@@ skipping 69 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(bool invert) const {
-#if !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_IOS)
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
   if (!IsEditingOrEmpty()) {
     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;
   }
@@ skipping 81 matching lines @@
   if (client) {
     model_.reset(new OmniboxEditModel(this, controller, std::move(client)));
   }
 }
 
 void OmniboxView::TextChanged() {
   EmphasizeURLComponents();
   if (model_.get())
     model_->OnChanged();
 }