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

Side by Side Diff: chrome/browser/media/media_stream_device_permissions.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/media/media_stream_device_permissions.h" 5 #include "chrome/browser/media/media_stream_device_permissions.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/prefs/pref_service.h"
10 #include "base/values.h" 9 #include "base/values.h"
11 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
12 #include "components/content_settings/core/browser/host_content_settings_map.h" 11 #include "components/content_settings/core/browser/host_content_settings_map.h"
13 #include "components/content_settings/core/common/content_settings_pattern.h" 12 #include "components/content_settings/core/common/content_settings_pattern.h"
13 #include "components/prefs/pref_service.h"
14 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
15 #include "content/public/common/origin_util.h" 15 #include "content/public/common/origin_util.h"
16 #include "extensions/common/constants.h" 16 #include "extensions/common/constants.h"
17 #include "url/gurl.h" 17 #include "url/gurl.h"
18 18
19 bool ShouldPersistContentSetting(ContentSetting setting, 19 bool ShouldPersistContentSetting(ContentSetting setting,
20 const GURL& origin, 20 const GURL& origin,
21 bool is_pepper_request) { 21 bool is_pepper_request) {
22 // When the request is from an invalid scheme we don't persist it. 22 // When the request is from an invalid scheme we don't persist it.
23 if (!ContentSettingsPattern::FromURLNoWildcard(origin).IsValid()) 23 if (!ContentSettingsPattern::FromURLNoWildcard(origin).IsValid())
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 // If a match was not found, check if audio capture is otherwise disallowed 69 // If a match was not found, check if audio capture is otherwise disallowed
70 // or if the user should be prompted. Setting the policy value to "true" 70 // or if the user should be prompted. Setting the policy value to "true"
71 // is equal to not setting it at all, so from hereon out, we will return 71 // is equal to not setting it at all, so from hereon out, we will return
72 // either POLICY_NOT_SET (prompt) or ALWAYS_DENY (no prompt, no access). 72 // either POLICY_NOT_SET (prompt) or ALWAYS_DENY (no prompt, no access).
73 if (!prefs->GetBoolean(policy_name)) 73 if (!prefs->GetBoolean(policy_name))
74 return ALWAYS_DENY; 74 return ALWAYS_DENY;
75 75
76 return POLICY_NOT_SET; 76 return POLICY_NOT_SET;
77 } 77 }
OLDNEW
« no previous file with comments | « chrome/browser/media/media_stream_capture_indicator.cc ('k') | chrome/browser/media/media_stream_devices_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698