chrome/browser/prefs/browser_prefs.cc - Issue 10537099: add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 10537099: add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 6 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

« chrome/browser/media/media_stream_devices_prefs.cc ('K') | « chrome/browser/policy/configuration_policy_handler_list.cc ('k') | chrome/browser/prefs/pref_model_associator.cc » ('j') | chrome/browser/resources/options2/content_settings_exceptions_area.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index 45ef65193e0188c8aab23bafaac40a9721e8b4e6..75b939db43d7a34ca4767f2060bae743cb6df97d 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -27,6 +27,7 @@

#include "chrome/browser/intents/web_intents_util.h"

#include "chrome/browser/intranet_redirect_detector.h"

#include "chrome/browser/managed_mode.h"

+#include "chrome/browser/media/media_stream_devices_prefs.h"

#include "chrome/browser/metrics/metrics_log.h"

#include "chrome/browser/metrics/metrics_service.h"

#include "chrome/browser/metrics/variations_service.h"

@@ -196,6 +197,7 @@ void RegisterUserPrefs(PrefService* user_prefs) {

HostContentSettingsMap::RegisterUserPrefs(user_prefs);

IncognitoModePrefs::RegisterUserPrefs(user_prefs);

InstantController::RegisterUserPrefs(user_prefs);

+ MediaStreamDevicesPrefs::RegisterUserPrefs(user_prefs);

NetPrefObserver::RegisterPrefs(user_prefs);

NewTabUI::RegisterUserPrefs(user_prefs);

PasswordManager::RegisterUserPrefs(user_prefs);