Fix WebRTC support (issue #531).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1131 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-03-07 01:20:24 +00:00
parent 9b9c283ec2
commit 920ee60499
14 changed files with 417 additions and 53 deletions

View File

@@ -3,19 +3,21 @@
// be found in the LICENSE file.
#include "libcef/browser/browser_pref_store.h"
#include "libcef/browser/media_capture_devices_dispatcher.h"
#include "base/command_line.h"
#include "base/prefs/pref_service_builder.h"
#include "base/prefs/pref_registry_simple.h"
#include "base/values.h"
#include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
#include "chrome/browser/prefs/command_line_pref_store.h"
#include "chrome/browser/prefs/proxy_config_dictionary.h"
#include "chrome/common/pref_names.h"
BrowserPrefStore::BrowserPrefStore() {
CefBrowserPrefStore::CefBrowserPrefStore() {
}
PrefService* BrowserPrefStore::CreateService() {
PrefService* CefBrowserPrefStore::CreateService() {
PrefServiceBuilder builder;
builder.WithCommandLinePrefs(
new CommandLinePrefStore(CommandLine::ForCurrentProcess()));
@@ -24,11 +26,11 @@ PrefService* BrowserPrefStore::CreateService() {
scoped_refptr<PrefRegistrySimple> registry(new PrefRegistrySimple());
// Default settings.
registry->RegisterDictionaryPref(prefs::kProxy,
ProxyConfigDictionary::CreateDirect());
CefMediaCaptureDevicesDispatcher::RegisterPrefs(registry);
PrefProxyConfigTrackerImpl::RegisterPrefs(registry);
return builder.Create(registry);
}
BrowserPrefStore::~BrowserPrefStore() {
CefBrowserPrefStore::~CefBrowserPrefStore() {
}