summaryrefslogtreecommitdiffstats
path: root/base/perftimer.h
diff options
context:
space:
mode:
authorIain Merrick <husky@google.com>2010-10-19 14:37:37 +0100
committerIain Merrick <husky@google.com>2010-10-19 14:37:37 +0100
commit3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch)
tree7784b988ef1698cb6967ea1bdf07616237716c6c /base/perftimer.h
parentefc8475837ec58186051f23bb03542620424f6ce (diff)
downloadexternal_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.zip
external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz
external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.bz2
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used. Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'base/perftimer.h')
-rw-r--r--base/perftimer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/base/perftimer.h b/base/perftimer.h
index 1ac1a7d..dae6d61 100644
--- a/base/perftimer.h
+++ b/base/perftimer.h
@@ -4,6 +4,7 @@
#ifndef BASE_PERFTIMER_H_
#define BASE_PERFTIMER_H_
+#pragma once
#include <string>