summaryrefslogtreecommitdiffstats
path: root/base/observer_list_threadsafe.h
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-14 18:15:28 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-14 18:15:28 +0000
commita91e1409a1b702892be19b058ad418b92ab4dd28 (patch)
treef65055a03ec7147674e921e80664be5bef9acef0 /base/observer_list_threadsafe.h
parent1ebe3cefbab03f450586895feea998f994ff13f8 (diff)
downloadchromium_src-a91e1409a1b702892be19b058ad418b92ab4dd28.zip
chromium_src-a91e1409a1b702892be19b058ad418b92ab4dd28.tar.gz
chromium_src-a91e1409a1b702892be19b058ad418b92ab4dd28.tar.bz2
Reland r52336.
(I accidentally committed a previous version of the patch (the fixed version was in codereview since I had switched to my mac to address this exact compile failure.) BUG=none TEST=none TBR=evan Review URL: http://codereview.chromium.org/2937010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/observer_list_threadsafe.h')
-rw-r--r--base/observer_list_threadsafe.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/base/observer_list_threadsafe.h b/base/observer_list_threadsafe.h
index 62db5dc..f7dabef 100644
--- a/base/observer_list_threadsafe.h
+++ b/base/observer_list_threadsafe.h
@@ -5,8 +5,9 @@
#ifndef BASE_OBSERVER_LIST_THREADSAFE_H_
#define BASE_OBSERVER_LIST_THREADSAFE_H_
-#include <vector>
#include <algorithm>
+#include <map>
+#include <vector>
#include "base/basictypes.h"
#include "base/callback.h"