Vectorize LocationIconView 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"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/omnibox_client.h"
 #include "components/omnibox/browser/omnibox_edit_controller.h"
 #include "components/toolbar/toolbar_model.h"
 #include "grit/components_scaled_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/vector_icons_public.h"
 
 // static
 base::string16 OmniboxView::StripJavascriptSchemas(const base::string16& text) {
   const base::string16 kJsPrefix(
       base::ASCIIToUTF16(url::kJavaScriptScheme) + base::ASCIIToUTF16(":"));
   base::string16 out(text);
   while (base::StartsWith(out, kJsPrefix,
                           base::CompareCase::INSENSITIVE_ASCII)) {
     base::TrimWhitespace(out.substr(kJsPrefix.length()), base::TRIM_LEADING,
                          &out);
@@ skipping 44 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 {
+#if !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_IOS)
+  if (!IsEditingOrEmpty())
+    return controller_->GetToolbarModel()->GetVectorIcon();
+  gfx::VectorIconId id = AutocompleteMatch::TypeToVectorIcon(
+      model_.get() ? model_->CurrentTextType()

[Peter Kasting, 2015/10/21 19:45:47]

Nit: .get() unneeded

[Evan Stade, 2015/10/21 23:20:01]

Done.

+                   : AutocompleteMatchType::URL_WHAT_YOU_TYPED);
+  return (id == gfx::VectorIconId::OMNIBOX_HTTP)
+             ? gfx::VectorIconId::LOCATION_BAR_HTTP
+             : id;

[Peter Kasting, 2015/10/21 19:45:47]

Honestly I'm not actually clear on what this last conditional is doing, maybe
add a comment?

[Evan Stade, 2015/10/21 23:20:01]

done

+#else
+  NOTIMPLEMENTED();
+  return gfx::VectorIconId::VECTOR_ICON_NONE;
+#endif
+}
+
 void OmniboxView::SetUserText(const base::string16& text) {
   SetUserText(text, text, true);
 }
 
 void OmniboxView::SetUserText(const base::string16& text,
                               const base::string16& display_text,
                               bool update_popup) {
   if (model_.get())
     model_->SetUserText(text);
   SetWindowTextAndCaretPos(display_text, display_text.length(), update_popup,
@@ skipping 58 matching lines @@
     model_.reset(
         new OmniboxEditModel(this, controller, client.Pass()));
   }
 }
 
 void OmniboxView::TextChanged() {
   EmphasizeURLComponents();
   if (model_.get())
     model_->OnChanged();
 }