summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_framer.h
diff options
context:
space:
mode:
authormbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-09 20:18:50 +0000
committermbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-09 20:18:50 +0000
commit74188f235dd5b4f8e80ca30d6e3a4d4c3061d84d (patch)
treeb27e432a39963d7738c1464001158d2b905c6fc4 /net/spdy/spdy_framer.h
parent6c86698860a88d07b21da6efdaf41ceb8273ccb1 (diff)
downloadchromium_src-74188f235dd5b4f8e80ca30d6e3a4d4c3061d84d.zip
chromium_src-74188f235dd5b4f8e80ca30d6e3a4d4c3061d84d.tar.gz
chromium_src-74188f235dd5b4f8e80ca30d6e3a4d4c3061d84d.tar.bz2
Take 2 at landing the SPDY SETTINGS frame patch.
BUG=34749 TEST=SpdyNetworkTransactionTest.Setting* Review URL: http://codereview.chromium.org/1547028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44118 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_framer.h')
-rw-r--r--net/spdy/spdy_framer.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/spdy/spdy_framer.h b/net/spdy/spdy_framer.h
index ab454cd..c265be9 100644
--- a/net/spdy/spdy_framer.h
+++ b/net/spdy/spdy_framer.h
@@ -43,7 +43,8 @@ void FramerSetEnableCompressionHelper(SpdyFramer* framer, bool compress);
typedef std::map<std::string, std::string> SpdyHeaderBlock;
// A datastructure for holding a set of ID/value pairs for a SETTINGS frame.
-typedef std::list<std::pair<spdy::SettingsFlagsAndId, uint32> > SpdySettings;
+typedef std::pair<spdy::SettingsFlagsAndId, uint32> SpdySetting;
+typedef std::list<SpdySetting> SpdySettings;
// SpdyFramerVisitorInterface is a set of callbacks for the SpdyFramer.
// Implement this interface to receive event callbacks as frames are