summaryrefslogtreecommitdiffstats
path: root/chrome_frame/np_proxy_service.cc
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-08 19:59:02 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-08 19:59:02 +0000
commitd3878dbe457b10c50ac1df6eed2f2255e990801a (patch)
treeb973eae112db889f024c3206613e4986eb9207be /chrome_frame/np_proxy_service.cc
parent64d31b1b238580d1bbf830dde6a7fe3ebe2ef65f (diff)
downloadchromium_src-d3878dbe457b10c50ac1df6eed2f2255e990801a.zip
chromium_src-d3878dbe457b10c50ac1df6eed2f2255e990801a.tar.gz
chromium_src-d3878dbe457b10c50ac1df6eed2f2255e990801a.tar.bz2
Applying "Solving a bug in Chrome Frame that Firefox doesn't set preferences correctly during startup" for hansl@.
Original review here: http://codereview.chromium.org/2909003/show TBR=hansl Review URL: http://codereview.chromium.org/2924004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/np_proxy_service.cc')
-rw-r--r--chrome_frame/np_proxy_service.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome_frame/np_proxy_service.cc b/chrome_frame/np_proxy_service.cc
index cb26dac..2e648ca 100644
--- a/chrome_frame/np_proxy_service.cc
+++ b/chrome_frame/np_proxy_service.cc
@@ -80,7 +80,6 @@ bool NpProxyService::InitializePrefBranch(nsIPrefService* pref_service) {
bool result = false;
ScopedNsPtr<nsIPrefBranch> pref_branch;
- pref_service->ReadUserPrefs(nsnull);
pref_service->GetBranch(kProxyObserverRoot, pref_branch.Receive());
if (!pref_branch) {