switch to gfx::VectorIconId::VIDEOCAM and add one for microphone too.
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/20c051a9a415b64187d410d0ec207c0442d784f5 commit 20c051a9a415b64187d410d0ec207c0442d784f5 Author: estade <estade@chromium.org> Date: Sat Oct 15 22:53:22 2016 Make PermissionRequest::GetIconId return different types on desktop and Android so that the IDR_ and vector id versions don't coexist on any single platform. BUG= 651270 Review-Url: https://codereview.chromium.org/2385063005 Cr-Commit-Position: refs/heads/master@{#425577} [delete] https://crrev.com/6759df3b42a5d4dcd95dbefb72e2c0ce2e220730/chrome/app/theme/default_100_percent/common/infobar_media_stream_screen_share.png [delete] https://crrev.com/6759df3b42a5d4dcd95dbefb72e2c0ce2e220730/chrome/app/theme/default_100_percent/common/infobar_warning.png [delete] https://crrev.com/6759df3b42a5d4dcd95dbefb72e2c0ce2e220730/chrome/app/theme/default_100_percent/register_protocol_handler.png [delete] https://crrev.com/6759df3b42a5d4dcd95dbefb72e2c0ce2e220730/chrome/app/theme/default_200_percent/common/infobar_media_stream_screen_share.png [delete] https://crrev.com/6759df3b42a5d4dcd95dbefb72e2c0ce2e220730/chrome/app/theme/default_200_percent/common/infobar_warning.png [delete] https://crrev.com/6759df3b42a5d4dcd95dbefb72e2c0ce2e220730/chrome/app/theme/default_200_percent/register_protocol_handler.png [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/app/theme/theme_resources.grd [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/BUILD.gn [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/android/media/media_throttle_infobar_delegate.cc [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/android/resource_id.h [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/chrome_quota_permission_context.cc [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/custom_handlers/register_protocol_handler_permission_request.cc [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/custom_handlers/register_protocol_handler_permission_request.h [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/download/download_permission_request.cc [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/download/download_permission_request.h [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/media/webrtc/media_stream_capture_indicator.cc [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/media/webrtc/media_stream_devices_controller.cc [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/media/webrtc/media_stream_devices_controller.h [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/media/webrtc/screen_capture_infobar_delegate_android.cc [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/permissions/mock_permission_request.cc [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/permissions/mock_permission_request.h [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/permissions/permission_request.cc [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/permissions/permission_request.h [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/permissions/permission_request_impl.cc [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/permissions/permission_request_impl.h [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/permissions/permission_request_manager.cc [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/permissions/permission_update_infobar_delegate_android.cc [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/chrome/browser/ui/views/website_settings/permission_prompt_impl.cc [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/components/resources/autofill_scaled_resources.grdp [modify] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/ui/gfx/vector_icons/BUILD.gn [add] https://crrev.com/20c051a9a415b64187d410d0ec207c0442d784f5/ui/gfx/vector_icons/microphone.icon
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/089cf6d16f3733ff8c78767c56bd8856e6695d09 commit 089cf6d16f3733ff8c78767c56bd8856e6695d09 Author: Evan Stade <estade@chromium.org> Date: Thu Oct 27 15:32:55 2016 Make PermissionRequest::GetIconId return different types on desktop and Android so that the IDR_ and vector id versions don't coexist on any single platform. BUG= 651270 Review-Url: https://codereview.chromium.org/2385063005 Cr-Commit-Position: refs/heads/master@{#425577} (cherry picked from commit 20c051a9a415b64187d410d0ec207c0442d784f5) Review URL: https://codereview.chromium.org/2454813004 . Cr-Commit-Position: refs/branch-heads/2883@{#333} Cr-Branched-From: 614d31daee2f61b0180df403a8ad43f20b9f6dd7-refs/heads/master@{#423768} [delete] https://crrev.com/73d753ea2251d5cebfd6cef62a48be7ef95a82ee/chrome/app/theme/default_100_percent/common/infobar_media_stream_screen_share.png [delete] https://crrev.com/73d753ea2251d5cebfd6cef62a48be7ef95a82ee/chrome/app/theme/default_100_percent/common/infobar_warning.png [delete] https://crrev.com/73d753ea2251d5cebfd6cef62a48be7ef95a82ee/chrome/app/theme/default_100_percent/register_protocol_handler.png [delete] https://crrev.com/73d753ea2251d5cebfd6cef62a48be7ef95a82ee/chrome/app/theme/default_200_percent/common/infobar_media_stream_screen_share.png [delete] https://crrev.com/73d753ea2251d5cebfd6cef62a48be7ef95a82ee/chrome/app/theme/default_200_percent/common/infobar_warning.png [delete] https://crrev.com/73d753ea2251d5cebfd6cef62a48be7ef95a82ee/chrome/app/theme/default_200_percent/register_protocol_handler.png [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/app/theme/theme_resources.grd [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/BUILD.gn [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/android/media/media_throttle_infobar_delegate.cc [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/android/resource_id.h [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/chrome_quota_permission_context.cc [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/custom_handlers/register_protocol_handler_permission_request.cc [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/custom_handlers/register_protocol_handler_permission_request.h [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/download/download_permission_request.cc [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/download/download_permission_request.h [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/media/webrtc/media_stream_capture_indicator.cc [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/media/webrtc/media_stream_devices_controller.cc [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/media/webrtc/media_stream_devices_controller.h [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/media/webrtc/screen_capture_infobar_delegate_android.cc [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/permissions/mock_permission_request.cc [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/permissions/mock_permission_request.h [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/permissions/permission_request.cc [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/permissions/permission_request.h [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/permissions/permission_request_impl.cc [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/permissions/permission_request_impl.h [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/permissions/permission_request_manager.cc [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/permissions/permission_update_infobar_delegate_android.cc [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/chrome/browser/ui/views/website_settings/permission_prompt_impl.cc [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/components/resources/autofill_scaled_resources.grdp [modify] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/ui/gfx/vector_icons/BUILD.gn [add] https://crrev.com/089cf6d16f3733ff8c78767c56bd8856e6695d09/ui/gfx/vector_icons/microphone.icon
[Automated comment] removing mislabelled merge-merged-2840
Comment 1 by bugdroid1@chromium.org
, Oct 15 2016