Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(301)

Unified Diff: chrome/browser/permissions/permission_request_impl.cc

Issue 2685683004: Move more vector icons to more appropriate directories. (Closed)
Patch Set: rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/permissions/permission_request.h ('k') | chrome/browser/ui/toolbar/media_router_action.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/permissions/permission_request_impl.cc
diff --git a/chrome/browser/permissions/permission_request_impl.cc b/chrome/browser/permissions/permission_request_impl.cc
index f5a277a08f049809c22114273eda30df34652a73..ab91ab6481958080d59b83bc81b2ae0ec3b681fa 100644
--- a/chrome/browser/permissions/permission_request_impl.cc
+++ b/chrome/browser/permissions/permission_request_impl.cc
@@ -11,10 +11,12 @@
#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(
@@ -62,22 +64,22 @@ PermissionRequest::IconId PermissionRequestImpl::GetIconId() const {
#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;
}
#endif
}
« no previous file with comments | « chrome/browser/permissions/permission_request.h ('k') | chrome/browser/ui/toolbar/media_router_action.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698