Move around more vector icons.

chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc

 // Copyright 2016 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/toolbar/chrome_toolbar_model_delegate.h"
 
 #include "base/logging.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/prefs/pref_service.h"
 #include "components/security_state/core/security_state.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/ssl_status.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
-#include "ui/gfx/vector_icons_public.h"
+
+#if !defined(OS_ANDROID)
+#include "components/omnibox/browser/vector_icons.h" // nogncheck
+#include "components/toolbar/vector_icons.h"  // nogncheck
+#endif
 
 ChromeToolbarModelDelegate::ChromeToolbarModelDelegate() {}
 
 ChromeToolbarModelDelegate::~ChromeToolbarModelDelegate() {}
 
 base::string16 ChromeToolbarModelDelegate::FormattedStringWithEquivalentMeaning(
     const GURL& url,
     const base::string16& formatted_url) const {
   return AutocompleteInput::FormattedStringWithEquivalentMeaning(
       url, formatted_url, ChromeAutocompleteSchemeClassifier(GetProfile()));
@@ skipping 64 matching lines @@
   // initialization), so nothing can fail.
   if (!web_contents)
     return false;
   security_state::SecurityInfo security_info;
   SecurityStateTabHelper::FromWebContents(web_contents)
       ->GetSecurityInfo(&security_info);
   return security_info.malicious_content_status !=
          security_state::MALICIOUS_CONTENT_STATUS_NONE;
 }
 
-gfx::VectorIconId ChromeToolbarModelDelegate::GetVectorIconOverride() const {
+const gfx::VectorIcon* ChromeToolbarModelDelegate::GetVectorIconOverride()
+    const {
 #if !defined(OS_ANDROID)
   GURL url;
   GetURL(&url);
 
   if (url.SchemeIs(content::kChromeUIScheme))
-    return gfx::VectorIconId::LOCATION_BAR_PRODUCT;
+    return &toolbar::kProductIcon;
 
   if (url.SchemeIs(extensions::kExtensionScheme))
-    return gfx::VectorIconId::OMNIBOX_EXTENSION_APP;
+    return &omnibox::kExtensionAppIcon;
 #endif
 
-  return gfx::VectorIconId::VECTOR_ICON_NONE;
+  return nullptr;
 }
 
 content::NavigationController*
 ChromeToolbarModelDelegate::GetNavigationController() const {
   // This |current_tab| can be null during the initialization of the toolbar
   // during window creation (i.e. before any tabs have been added to the
   // window).
   content::WebContents* current_tab = GetActiveWebContents();
   return current_tab ? &current_tab->GetController() : nullptr;
 }
 
 content::NavigationEntry* ChromeToolbarModelDelegate::GetNavigationEntry()
     const {
   content::NavigationController* controller = GetNavigationController();
   return controller ? controller->GetVisibleEntry() : nullptr;
 }
 
 Profile* ChromeToolbarModelDelegate::GetProfile() const {
   content::NavigationController* controller = GetNavigationController();
   return controller
              ? Profile::FromBrowserContext(controller->GetBrowserContext())
              : nullptr;
 }