diff options
| author | jamescook <jamescook@chromium.org> | 2015-01-07 12:47:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-07 20:49:05 +0000 |
| commit | 928c5e821a9885f255a337fad298c7f7d26b8511 (patch) | |
| tree | ff44625300082b475347177242609efc0df248c0 /extensions/shell | |
| parent | 9205d0800cfdfc1e74d70121265992c2bbfa1d12 (diff) | |
| download | chromium_src-928c5e821a9885f255a337fad298c7f7d26b8511.zip chromium_src-928c5e821a9885f255a337fad298c7f7d26b8511.tar.gz chromium_src-928c5e821a9885f255a337fad298c7f7d26b8511.tar.bz2 | |
cros: Remove system-level policy for audio capture allowed
The "audio capture allowed" policy exists both at the system level (local state) and at the user level (profile). This was done for historical reasons that no longer apply.
The user level policy still prevents audio capture via hooks in Chrome's media pipeline.
This CL simplifies the chromeos/audio and app_shell code that uses it.
BUG=443695
TEST=chromeos_unittests and app_shell_unittests
Review URL: https://codereview.chromium.org/817013002
Cr-Commit-Position: refs/heads/master@{#310360}
Diffstat (limited to 'extensions/shell')
| -rw-r--r-- | extensions/shell/browser/shell_browser_main_parts.cc | 2 | ||||
| -rw-r--r-- | extensions/shell/browser/shell_prefs.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc index 8b2133a..bd4bd71 100644 --- a/extensions/shell/browser/shell_browser_main_parts.cc +++ b/extensions/shell/browser/shell_browser_main_parts.cc @@ -144,7 +144,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() { #if defined(OS_CHROMEOS) chromeos::CrasAudioHandler::Initialize( - new chromeos::AudioDevicesPrefHandlerImpl(local_state_.get(), "")); + new chromeos::AudioDevicesPrefHandlerImpl(local_state_.get())); audio_controller_.reset(new ShellAudioController()); #endif diff --git a/extensions/shell/browser/shell_prefs.cc b/extensions/shell/browser/shell_prefs.cc index 2f9ca82..5c257bd 100644 --- a/extensions/shell/browser/shell_prefs.cc +++ b/extensions/shell/browser/shell_prefs.cc @@ -27,7 +27,7 @@ namespace { void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { #if defined(OS_CHROMEOS) - chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry, ""); + chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); #endif } |