diff options
| author | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 09:13:44 +0000 |
|---|---|---|
| committer | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 09:13:44 +0000 |
| commit | a9c23a5d29f9aab00fd936801e0dbbed91c18796 (patch) | |
| tree | ed72849a3f2b0701ce08c429fea2c6f1936929ce /chrome/browser/browser_main.cc | |
| parent | a06f7c07423533d4a6ba654be81ce70e82f0449d (diff) | |
| download | chromium_src-a9c23a5d29f9aab00fd936801e0dbbed91c18796.zip chromium_src-a9c23a5d29f9aab00fd936801e0dbbed91c18796.tar.gz chromium_src-a9c23a5d29f9aab00fd936801e0dbbed91c18796.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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<PrefService> 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. |