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

Unified Diff: chrome/browser/media/webrtc/media_stream_devices_controller.cc

Issue 2385063005: Make PermissionRequest::GetIconId return different types (Closed)
Patch Set: git cl try Created 4 years, 2 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 366ff37373c654a16138bdbda18263aaa75015a3..028080207afdf43a7479e793b95b663cd7ad2129 100644
--- a/chrome/browser/media/webrtc/media_stream_devices_controller.cc
+++ b/chrome/browser/media/webrtc/media_stream_devices_controller.cc
@@ -40,6 +40,7 @@
#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 BUILDFLAG(ANDROID_JAVA_UI)
#include <vector>
@@ -275,11 +276,11 @@ void MediaStreamDevicesController::ForcePermissionDeniedTemporarily() {
set_persist(true);
}
-int MediaStreamDevicesController::GetIconId() const {
+PermissionRequest::IconId MediaStreamDevicesController::GetIconId() const {
if (IsAskingForVideo())
- return IDR_INFOBAR_MEDIA_STREAM_CAMERA;
+ return gfx::VectorIconId::VIDEOCAM;
- return IDR_INFOBAR_MEDIA_STREAM_MIC;
+ return gfx::VectorIconId::MICROPHONE;
Peter Kasting 2016/10/06 07:10:29 Nit: Shorter: return IsAskingForVideo() ? gfx::
Evan Stade 2016/10/06 15:33:50 Done.
}
base::string16 MediaStreamDevicesController::GetMessageTextFragment() const {

Powered by Google App Engine
This is Rietveld 408576698