bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 237081.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1532 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-11-25 23:04:25 +00:00
parent 777e3c440e
commit 3d218e4442
11 changed files with 81 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libcef/browser/browser_pref_store.cc
View File

@@ -6,7 +6,8 @@
#include "libcef/browser/media_capture_devices_dispatcher.h"
#include "base/command_line.h"
#include "base/prefs/pref_service_builder.h"
#include "base/prefs/pref_service.h"
#include "base/prefs/pref_service_factory.h"
#include "base/prefs/pref_registry_simple.h"
#include "base/values.h"
#include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
@@ -17,11 +18,11 @@
CefBrowserPrefStore::CefBrowserPrefStore() {
}
PrefService* CefBrowserPrefStore::CreateService() {
PrefServiceBuilder builder;
builder.WithCommandLinePrefs(
scoped_ptr<PrefService> CefBrowserPrefStore::CreateService() {
base::PrefServiceFactory factory;
factory.set_command_line_prefs(
new CommandLinePrefStore(CommandLine::ForCurrentProcess()));
builder.WithUserPrefs(this);
factory.set_user_prefs(this);
scoped_refptr<PrefRegistrySimple> registry(new PrefRegistrySimple());
@@ -31,7 +32,7 @@ PrefService* CefBrowserPrefStore::CreateService() {
registry->RegisterBooleanPref(prefs::kPrintingEnabled, true);
return builder.Create(registry);
return factory.Create(registry);
}
CefBrowserPrefStore::~CefBrowserPrefStore() {