summaryrefslogtreecommitdiffstats
path: root/chrome_frame/urlmon_moniker.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-30 22:18:56 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-30 22:18:56 +0000
commit1357c32474af4190d22ccca26bf414443252784b (patch)
tree620927f5a079c5850e59d9774f4747b76d60ed11 /chrome_frame/urlmon_moniker.h
parentb99603ceb9cbec4a3b1ca9ac535f6b1cbc951bb8 (diff)
downloadchromium_src-1357c32474af4190d22ccca26bf414443252784b.zip
chromium_src-1357c32474af4190d22ccca26bf414443252784b.tar.gz
chromium_src-1357c32474af4190d22ccca26bf414443252784b.tar.bz2
Move thread local stuff from base to base/threading and consistently use the
base namespace. This also fixes references to TLSSlot to base::ThreadLocalStorage::Slot. TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/5986012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70322 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/urlmon_moniker.h')
-rw-r--r--chrome_frame/urlmon_moniker.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/urlmon_moniker.h b/chrome_frame/urlmon_moniker.h
index dde70adb..ea3245c 100644
--- a/chrome_frame/urlmon_moniker.h
+++ b/chrome_frame/urlmon_moniker.h
@@ -12,7 +12,7 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
-#include "base/thread_local.h"
+#include "base/threading/thread_local.h"
#include "base/win/scoped_variant.h"
#include "googleurl/src/gurl.h"
#include "chrome_frame/utils.h"