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

Unified Diff: chrome/browser/media/media_capture_devices_dispatcher.cc

Issue 1034143002: Content settings clean-up: Clarify resource identifier & get rid of NO_RESOURCE_IDENTIFIER. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing nit. Created 5 years, 8 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 | « no previous file | chrome/browser/media/media_stream_devices_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/media_capture_devices_dispatcher.cc
diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc
index cba2d992c2e7fa046ffe656267104bfd8046c1f5..4bfb4c9b75e67baa6562e8701bfd2f84fdc736ce 100644
--- a/chrome/browser/media/media_capture_devices_dispatcher.cc
+++ b/chrome/browser/media/media_capture_devices_dispatcher.cc
@@ -28,7 +28,6 @@
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
-#include "components/content_settings/core/browser/content_settings_provider.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "content/public/browser/browser_thread.h"
@@ -423,7 +422,7 @@ bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission(
security_origin,
security_origin,
contentSettingsType,
- NO_RESOURCE_IDENTIFIER) == CONTENT_SETTING_ALLOW) {
+ content_settings::ResourceIdentifier()) == CONTENT_SETTING_ALLOW) {
return true;
}
@@ -469,7 +468,7 @@ bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission(
security_origin,
security_origin,
contentSettingsType,
- NO_RESOURCE_IDENTIFIER) == CONTENT_SETTING_ALLOW) {
+ content_settings::ResourceIdentifier()) == CONTENT_SETTING_ALLOW) {
return true;
}
« no previous file with comments | « no previous file | chrome/browser/media/media_stream_devices_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698