diff options
| author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
| commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
| tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /chrome/browser/browser_process_sub_thread.h | |
| parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
| download | external_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 'chrome/browser/browser_process_sub_thread.h')
| -rw-r--r-- | chrome/browser/browser_process_sub_thread.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/browser_process_sub_thread.h b/chrome/browser/browser_process_sub_thread.h index c16997b..72f8372 100644 --- a/chrome/browser/browser_process_sub_thread.h +++ b/chrome/browser/browser_process_sub_thread.h @@ -4,6 +4,7 @@ #ifndef CHROME_BROWSER_BROWSER_PROCESS_SUB_THREAD_H_ #define CHROME_BROWSER_BROWSER_PROCESS_SUB_THREAD_H_ +#pragma once #include "base/basictypes.h" #include "chrome/browser/chrome_thread.h" @@ -37,4 +38,4 @@ class BrowserProcessSubThread : public ChromeThread { DISALLOW_COPY_AND_ASSIGN(BrowserProcessSubThread); }; -#endif // CHROME_BROWSER_BROWSER_PROCESS_SUB_THREAD_H_ +#endif // CHROME_BROWSER_BROWSER_PROCESS_SUB_THREAD_H_ |