webkit/port/platform/network/chromium/ResourceRequest.h - Issue 7419: Move many files that were suffixed Win.cpp to Chromium.cpp, and place them in...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: webkit/port/platform/network/chromium/ResourceRequest.h

Issue 7419: Move many files that were suffixed Win.cpp to Chromium.cpp, and place them in... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 12 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

Property Changes:

Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/webkit/port/platform/network/ResourceRequest.h:r69-2775

OLD	NEW
1 // -- mode: c++; c-basic-offset: 4 --	1 // -- mode: c++; c-basic-offset: 4 --

2 /*	2 /*

3 * Copyright (C) 2003, 2006 Apple Computer, Inc. All rights reserved.	3 * Copyright (C) 2003, 2006 Apple Computer, Inc. All rights reserved.

4 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>	4 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>

5 *	5 *

6 * Redistribution and use in source and binary forms, with or without	6 * Redistribution and use in source and binary forms, with or without

7 * modification, are permitted provided that the following conditions	7 * modification, are permitted provided that the following conditions

8 * are met:	8 * are met:

9 * 1. Redistributions of source code must retain the above copyright	9 * 1. Redistributions of source code must retain the above copyright

10 * notice, this list of conditions and the following disclaimer.	10 * notice, this list of conditions and the following disclaimer.

(...skipping 119 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
130	130

131 Frame* m_frame;	131 Frame* m_frame;

132 int m_originPid;	132 int m_originPid;

133 ResourceType::Type m_resourceType;	133 ResourceType::Type m_resourceType;

134 CString m_securityInfo;	134 CString m_securityInfo;

135 };	135 };

136	136

137 } // namespace WebCore	137 } // namespace WebCore

138	138

139 #endif // ResourceRequest_h	139 #endif // ResourceRequest_h

OLD	NEW

« no previous file with comments | « webkit/port/platform/network/chromium/ResourceError.h ('k') | webkit/port/platform/network/chromium/ResourceResponse.h » ('j') | no next file with comments »