Index: chrome/browser/renderer_host/resource_request_details.h |
=================================================================== |
--- chrome/browser/renderer_host/resource_request_details.h (revision 9158) |
+++ chrome/browser/renderer_host/resource_request_details.h (working copy) |
@@ -6,8 +6,8 @@ |
// resource request. It copies many of the publicly accessible member variables |
// of URLRequest, but exists on the UI thread. |
-#ifndef CHROME_BROWSER_RESOURCE_REQUEST_DETAILS_H__ |
-#define CHROME_BROWSER_RESOURCE_REQUEST_DETAILS_H__ |
+#ifndef CHROME_BROWSER_RENDERER_HOST_RESOURCE_REQUEST_DETAILS_H_ |
+#define CHROME_BROWSER_RENDERER_HOST_RESOURCE_REQUEST_DETAILS_H_ |
#include <string> |
@@ -64,7 +64,7 @@ |
int ssl_cert_status_; |
ResourceType::Type resource_type_; |
- DISALLOW_EVIL_CONSTRUCTORS(ResourceRequestDetails); |
+ DISALLOW_COPY_AND_ASSIGN(ResourceRequestDetails); |
}; |
// Details about a redirection of a resource request. |
@@ -83,5 +83,4 @@ |
GURL new_url_; |
}; |
-#endif // CHROME_BROWSER_RESOURCE_REQUEST_DETAILS_H__ |
- |
+#endif // CHROME_BROWSER_RENDERER_HOST_RESOURCE_REQUEST_DETAILS_H_ |
Property changes on: chrome\browser\renderer_host\resource_request_details.h |
___________________________________________________________________ |
Added: svn:mergeinfo |
Merged /branches/chrome_webkit_merge_branch/chrome/browser/resource_request_details.h:r69-2775 |