Move more vector icons to more appropriate directories.

chrome/browser/permissions/permission_request_impl.cc

 // Copyright 2014 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/permissions/permission_request_impl.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/url_formatter/elide_url.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/vector_icons_public.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/android_theme_resources.h"
+#else
+#include "chrome/app/vector_icons/vector_icons.h"
+#include "ui/vector_icons/vector_icons.h"
 #endif
 
 PermissionRequestImpl::PermissionRequestImpl(
     const GURL& request_origin,
     content::PermissionType permission_type,
     Profile* profile,
     bool has_gesture,
     const PermissionDecidedCallback& permission_decided_callback,
     const base::Closure delete_callback)
     : request_origin_(request_origin),
@@ skipping 25 matching lines @@
       return IDR_ANDROID_INFOBAR_MIDI;
     case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
       return IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER;
     default:
       NOTREACHED();
       return IDR_ANDROID_INFOBAR_WARNING;
   }
 #else
   switch (permission_type_) {
     case content::PermissionType::GEOLOCATION:
-      return gfx::VectorIconId::LOCATION_ON;
+      return ui::kLocationOnIcon;
     case content::PermissionType::NOTIFICATIONS:
     case content::PermissionType::PUSH_MESSAGING:
-      return gfx::VectorIconId::NOTIFICATIONS;
+      return ui::kNotificationsIcon;
 #if defined(OS_CHROMEOS)
     // TODO(xhwang): fix this icon, see crrev.com/863263007
     case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
-      return gfx::VectorIconId::PRODUCT;
+      return kProductIcon;
 #endif
     case content::PermissionType::MIDI_SYSEX:
-      return gfx::VectorIconId::MIDI;
+      return ui::kMidiIcon;
     case content::PermissionType::FLASH:
-      return gfx::VectorIconId::EXTENSION;
+      return ui::kExtensionIcon;
     default:
       NOTREACHED();
-      return gfx::VectorIconId::VECTOR_ICON_NONE;
+      return ui::kExtensionIcon;

[sky, 2017/02/13 21:35:38]

How come this is using ExtensionIcon?

[Evan Stade, 2017/02/13 21:53:33]

just as a placeholder; it shouldn't be hit.

   }
 #endif
 }
 
 base::string16 PermissionRequestImpl::GetMessageTextFragment() const {
   int message_id;
   switch (permission_type_) {
     case content::PermissionType::GEOLOCATION:
       message_id = IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT;
       break;
@@ skipping 71 matching lines @@
     case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
       return CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER;
 #endif
     case content::PermissionType::FLASH:
       return CONTENT_SETTINGS_TYPE_PLUGINS;
     default:
       NOTREACHED();
       return CONTENT_SETTINGS_TYPE_DEFAULT;
   }
 }