| Index: chrome/browser/renderer_host/resource_message_filter.h
|
| ===================================================================
|
| --- chrome/browser/renderer_host/resource_message_filter.h (revision 9146)
|
| +++ chrome/browser/renderer_host/resource_message_filter.h (working copy)
|
| @@ -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_RESOURCE_MSG_FILTER_H_
|
| -#define CHROME_BROWSER_RENDERER_RESOURCE_MSG_FILTER_H_
|
| +#ifndef CHROME_BROWSER_RENDERER_HOST_RESOURCE_MSG_FILTER_H_
|
| +#define CHROME_BROWSER_RENDERER_HOST_RESOURCE_MSG_FILTER_H_
|
|
|
| #include "base/clipboard.h"
|
| #include "base/file_path.h"
|
| @@ -241,4 +241,4 @@
|
| DISALLOW_COPY_AND_ASSIGN(ResourceMessageFilter);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_RENDERER_RESOURCE_MSG_FILTER_H_
|
| +#endif // CHROME_BROWSER_RENDERER_HOST_RESOURCE_MSG_FILTER_H_
|
|
|
| Property changes on: chrome\browser\renderer_host\resource_message_filter.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/chrome/browser/resource_message_filter.h:r69-2775
|
|
|
|
|