From a9c23a5d29f9aab00fd936801e0dbbed91c18796 Mon Sep 17 00:00:00 2001 From: "pam@chromium.org" Date: Wed, 4 Aug 2010 09:13:44 +0000 Subject: First stage of proxy extension API. Adds a basic API that will cover the features available with the --proxy-server command-line switch, once the underlying proxy config is rewritten to actually access the pref dynamically rather than only ever loading a proxy config on startup. BUG=48930 TEST=covered by browser_tests (ExtensionApiTest.Proxy*) Review URL: http://codereview.chromium.org/3074013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54882 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/browser_main.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/browser/browser_main.cc') diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 1c445461..c5117a4 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -521,7 +521,7 @@ PrefService* InitializeLocalState(const CommandLine& parsed_command_line, FilePath parent_profile = parsed_command_line.GetSwitchValuePath(switches::kParentProfile); scoped_ptr parent_local_state( - PrefService::CreatePrefService(parent_profile)); + PrefService::CreatePrefService(parent_profile, NULL)); parent_local_state->RegisterStringPref(prefs::kApplicationLocale, std::string()); // Right now, we only inherit the locale setting from the parent profile. -- cgit v1.1