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 181864.

Browse Source 
- Adds support for chrome://view-http-cache/*, chrome://appcache-internals/, chrome://blob-internals/, chrome://tcmalloc/ and chrome://histograms/

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1106 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-02-23 00:43:28 +00:00
parent fd97bbf292
commit 6f922731b4
64 changed files with 574 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libcef/browser/browser_pref_store.cc
View File

@@ -5,10 +5,10 @@
#include "libcef/browser/browser_pref_store.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/prefs/command_line_pref_store.h"
#include "chrome/browser/prefs/pref_service_builder.h"
#include "chrome/browser/prefs/pref_service_simple.h"
#include "chrome/browser/prefs/proxy_config_dictionary.h"
#include "chrome/common/pref_names.h"
@@ -21,13 +21,13 @@ PrefService* BrowserPrefStore::CreateService() {
new CommandLinePrefStore(CommandLine::ForCurrentProcess()));
builder.WithUserPrefs(this);
PrefServiceSimple* service = builder.CreateSimple();
scoped_refptr<PrefRegistrySimple> registry(new PrefRegistrySimple());
// Default settings.
service->RegisterDictionaryPref(prefs::kProxy,
ProxyConfigDictionary::CreateDirect());
registry->RegisterDictionaryPref(prefs::kProxy,
ProxyConfigDictionary::CreateDirect());
return service;
return builder.Create(registry);
}
BrowserPrefStore::~BrowserPrefStore() {