diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-16 02:40:41 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-29 14:33:06 +0100 |
| commit | 66a93bca8386dbe566b8ebbe4039d596bc52207f (patch) | |
| tree | 693ce7209771a7dd32c3c4fc578ff7def5f0cf6c /net | |
| parent | dc0f95d653279beabeb9817299e2902918ba123e (diff) | |
| download | external_chromium-66a93bca8386dbe566b8ebbe4039d596bc52207f.zip external_chromium-66a93bca8386dbe566b8ebbe4039d596bc52207f.tar.gz external_chromium-66a93bca8386dbe566b8ebbe4039d596bc52207f.tar.bz2 | |
Merge Chromium at r11.0.696.0: Fix conflict in load_flags_list.h
Local edit close to change:
http://src.chromium.org/viewvc/chrome/trunk/src/net/base/load_flags_list.h?view=diff&pathrev=77261&r1=77181&r2=77182
Moved the Android edit to the bottom, and updated the flag
to avoid conflict.
Change-Id: I4025fa59566b5cf3f9984eb3953d314baf191010
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/load_flags_list.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h index 55edc38..01ec552 100644 --- a/net/base/load_flags_list.h +++ b/net/base/load_flags_list.h @@ -102,15 +102,12 @@ LOAD_FLAG(REPORT_RAW_HEADERS, 1 << 22) // and is (in theory) not intended for the current frame. LOAD_FLAG(PREFETCH, 1 << 23) -<<<<<<< HEAD +// Indicates that this load was requested by a page that is currently +// prerendering. +LOAD_FLAG(PRERENDER, 1 << 24) + #ifdef ANDROID // Indicates that this is a load that ignores limits and should complete // immediately -LOAD_FLAG(IGNORE_LIMITS, 1 << 24) +LOAD_FLAG(IGNORE_LIMITS, 1 << 25) #endif - -======= -// Indicates that this load was requested by a page that is currently -// prerendering. -LOAD_FLAG(PRERENDER, 1 << 24) ->>>>>>> chromium.org at r11.0.696.0 |