summaryrefslogtreecommitdiffstats
path: root/chrome_frame/metrics_service.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/metrics_service.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/metrics_service.h')
-rw-r--r--chrome_frame/metrics_service.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/metrics_service.h b/chrome_frame/metrics_service.h
index baea9c8..5976c18 100644
--- a/chrome_frame/metrics_service.h
+++ b/chrome_frame/metrics_service.h
@@ -5,8 +5,8 @@
// This file defines a service that collects information about the user
// experience in order to help improve future versions of the app.
-#ifndef CHROME_FRAME_METRICS_METRICS_SERVICE_H_
-#define CHROME_FRAME_METRICS_METRICS_SERVICE_H_
+#ifndef CHROME_FRAME_METRICS_SERVICE_H_
+#define CHROME_FRAME_METRICS_SERVICE_H_
#include <map>
#include <string>
@@ -17,7 +17,7 @@
#include "base/metrics/histogram.h"
#include "base/platform_thread.h"
#include "base/scoped_ptr.h"
-#include "base/thread_local.h"
+#include "base/threading/thread_local.h"
#include "chrome/common/metrics_helpers.h"
// TODO(ananta)
@@ -153,4 +153,4 @@ class MetricsService : public MetricsServiceBase {
DISALLOW_COPY_AND_ASSIGN(MetricsService);
};
-#endif // CHROME_FRAME_METRICS_METRICS_SERVICE_H_
+#endif // CHROME_FRAME_METRICS_SERVICE_H_