Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(901)

Unified Diff: net/base/sdch_manager.h

Issue 155064: Merge r18936.... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/branches/172/src/
Patch Set: Created 11 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/sdch_filter_unittest.cc ('k') | net/base/sdch_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/sdch_manager.h
===================================================================
--- net/base/sdch_manager.h (revision 19709)
+++ net/base/sdch_manager.h (working copy)
@@ -120,8 +120,8 @@
CACHED_META_REFRESH_UNSUPPORTED = 75, // As above, but pulled from cache.
PASSING_THROUGH_NON_SDCH = 76, // Non-html tagged as sdch but malformed.
INCOMPLETE_SDCH_CONTENT = 77, // Last window was not completely decoded.
+ PASS_THROUGH_404_CODE = 78, // URL not found message passing through.
-
// Common decoded recovery methods.
META_REFRESH_CACHED_RECOVERY = 80, // Probably startup tab loading.
DISCARD_TENTATIVE_SDCH = 81, // Server decided not to use sdch.
Property changes on: net\base\sdch_manager.h
___________________________________________________________________
Modified: svn:mergeinfo
Merged /trunk/src/net/base/sdch_manager.h:r14162,16808,17560,18936
« no previous file with comments | « net/base/sdch_filter_unittest.cc ('k') | net/base/sdch_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698