diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-23 21:03:26 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-23 21:03:26 +0000 |
| commit | 0b4d43bc81aa786440e8e71de990fad93b32ca5d (patch) | |
| tree | 31dd60485e6b90fd960a805d4987ebff87974781 /content | |
| parent | cfbb875f047c61690b3a50dbe271a5a96be254f3 (diff) | |
| download | chromium_src-0b4d43bc81aa786440e8e71de990fad93b32ca5d.zip chromium_src-0b4d43bc81aa786440e8e71de990fad93b32ca5d.tar.gz chromium_src-0b4d43bc81aa786440e8e71de990fad93b32ca5d.tar.bz2 | |
Fix bad merge at r75645.
TEST=try
BUG=none
Review URL: http://codereview.chromium.org/6580007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/gpu_message_filter.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/renderer_host/gpu_message_filter.h b/content/browser/renderer_host/gpu_message_filter.h index 50d53942..3618594 100644 --- a/content/browser/renderer_host/gpu_message_filter.h +++ b/content/browser/renderer_host/gpu_message_filter.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_RENDERER_HOST_GPU_MESSAGE_FILTER_H_ -#define CHROME_BROWSER_RENDERER_HOST_GPU_MESSAGE_FILTER_H_ +#ifndef CONTENT_BROWSER_RENDERER_HOST_GPU_MESSAGE_FILTER_H_ +#define CONTENT_BROWSER_RENDERER_HOST_GPU_MESSAGE_FILTER_H_ #pragma once #include "chrome/browser/browser_message_filter.h" @@ -51,4 +51,4 @@ class GpuMessageFilter : public BrowserMessageFilter, DISALLOW_COPY_AND_ASSIGN(GpuMessageFilter); }; -#endif // CHROME_BROWSER_RENDERER_HOST_GPU_MESSAGE_FILTER_H_ +#endif // CONTENT_BROWSER_RENDERER_HOST_GPU_MESSAGE_FILTER_H_ |