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

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

Issue 518803009: Move content_settings_pattern and content_settings_pattern_parser to the content_settings component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/content_settings/host_content_settings_map.h" 10 #include "chrome/browser/content_settings/host_content_settings_map.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
13 #include "chrome/common/content_settings_pattern.h" 13 #include "components/content_settings/core/common/content_settings_pattern.h"
14 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
15 #include "url/gurl.h" 15 #include "url/gurl.h"
16 16
17 #if defined(OS_CHROMEOS) 17 #if defined(OS_CHROMEOS)
18 #include "components/user_manager/user_manager.h" 18 #include "components/user_manager/user_manager.h"
19 #endif 19 #endif
20 20
21 namespace { 21 namespace {
22 22
23 bool IsInKioskMode() { 23 bool IsInKioskMode() {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 // If a match was not found, check if audio capture is otherwise disallowed 79 // If a match was not found, check if audio capture is otherwise disallowed
80 // or if the user should be prompted. Setting the policy value to "true" 80 // or if the user should be prompted. Setting the policy value to "true"
81 // is equal to not setting it at all, so from hereon out, we will return 81 // is equal to not setting it at all, so from hereon out, we will return
82 // either POLICY_NOT_SET (prompt) or ALWAYS_DENY (no prompt, no access). 82 // either POLICY_NOT_SET (prompt) or ALWAYS_DENY (no prompt, no access).
83 if (!prefs->GetBoolean(policy_name)) 83 if (!prefs->GetBoolean(policy_name))
84 return ALWAYS_DENY; 84 return ALWAYS_DENY;
85 85
86 return POLICY_NOT_SET; 86 return POLICY_NOT_SET;
87 } 87 }
OLDNEW
« no previous file with comments | « chrome/browser/geolocation/geolocation_browsertest.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