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

Unified Diff: chrome/browser/media/webrtc/media_stream_devices_controller.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
Index: chrome/browser/media/webrtc/media_stream_devices_controller.cc
diff --git a/chrome/browser/media/webrtc/media_stream_devices_controller.cc b/chrome/browser/media/webrtc/media_stream_devices_controller.cc
index 7801ea48c8d43189e9065fed009291d1594b8b3f..9a22945633e6dd771da79a373ab3d53aa0cb4724 100644
--- a/chrome/browser/media/webrtc/media_stream_devices_controller.cc
+++ b/chrome/browser/media/webrtc/media_stream_devices_controller.cc
@@ -39,7 +39,6 @@
#include "content/public/common/origin_util.h"
#include "extensions/common/constants.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/vector_icons_public.h"
#if defined(OS_ANDROID)
#include <vector>
@@ -49,7 +48,9 @@
#include "chrome/grit/theme_resources.h"
#include "content/public/browser/android/content_view_core.h"
#include "ui/android/window_android.h"
-#endif // defined(OS_ANDROID)
+#else // !defined(OS_ANDROID)
+#include "ui/vector_icons/vector_icons.h"
+#endif
using content::BrowserThread;
@@ -280,8 +281,7 @@ PermissionRequest::IconId MediaStreamDevicesController::GetIconId() const {
return IsAskingForVideo() ? IDR_INFOBAR_MEDIA_STREAM_CAMERA
: IDR_INFOBAR_MEDIA_STREAM_MIC;
#else
- return IsAskingForVideo() ? gfx::VectorIconId::VIDEOCAM
- : gfx::VectorIconId::MICROPHONE;
+ return IsAskingForVideo() ? ui::kVideocamIcon : ui::kMicrophoneIcon;
#endif
}

Powered by Google App Engine
This is Rietveld 408576698