summaryrefslogtreecommitdiffstats
path: root/base/tracked.h
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-06-28 21:49:31 +0100
committerKristian Monsen <kristianm@google.com>2011-07-08 17:55:00 +0100
commitddb351dbec246cf1fab5ec20d2d5520909041de1 (patch)
tree158e3fb57bdcac07c7f1e767fde3c70687c9fbb1 /base/tracked.h
parent6b92e04f5f151c896e3088e86f70db7081009308 (diff)
downloadexternal_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.zip
external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.tar.gz
external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.tar.bz2
Merge Chromium at r12.0.742.93: Initial merge by git
Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
Diffstat (limited to 'base/tracked.h')
-rw-r--r--base/tracked.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/base/tracked.h b/base/tracked.h
index b4f6e36..45776d1 100644
--- a/base/tracked.h
+++ b/base/tracked.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -21,6 +21,7 @@
#include <string>
+#include "base/base_api.h"
#include "base/time.h"
#ifndef NDEBUG
@@ -35,7 +36,7 @@ namespace tracked_objects {
// Location provides basic info where of an object was constructed, or was
// significantly brought to life.
-class Location {
+class BASE_API Location {
public:
// Constructor should be called with a long-lived char*, such as __FILE__.
// It assumes the provided value will persist as a global constant, and it
@@ -87,7 +88,7 @@ class Location {
class Births;
-class Tracked {
+class BASE_API Tracked {
public:
Tracked();
virtual ~Tracked();