diff options
author | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-31 18:13:40 +0000 |
---|---|---|
committer | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-31 18:13:40 +0000 |
commit | 5edab80091453ee38f28e2240649bf91c9e3e658 (patch) | |
tree | 5ed0b46ca44e9f93c0d64986d3b309dcbb94d3ef /o3d/import/cross/archive_request.h | |
parent | 89382b154bfcf431169b6ded5ebcd26e0ec94aea (diff) | |
download | chromium_src-5edab80091453ee38f28e2240649bf91c9e3e658.zip chromium_src-5edab80091453ee38f28e2240649bf91c9e3e658.tar.gz chromium_src-5edab80091453ee38f28e2240649bf91c9e3e658.tar.bz2 |
Fix for archive request. It turns out this thing
can be called recursively. Because of that
ArchiveRequest::raw_data_ would be invalid when the
outer call came back. This way we mostly don't use
that field.
Also updated the docs so it can me marked as
deprecated.
Review URL: http://codereview.chromium.org/173620
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/import/cross/archive_request.h')
-rw-r--r-- | o3d/import/cross/archive_request.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/o3d/import/cross/archive_request.h b/o3d/import/cross/archive_request.h index 65158bb..980c449 100644 --- a/o3d/import/cross/archive_request.h +++ b/o3d/import/cross/archive_request.h @@ -70,15 +70,15 @@ class ArchiveRequest : public ObjectBase, public ArchiveCallbackClient { // can not be used to open arbitrary .tgz files but only those files someone // has specifically prepared for O3D. This file will not be passed to // the onfileavailable callback. - static const char* O3D_MARKER; + static const char* const kO3DMarker; - // The contents of the O3D_MARKER file. Arguably the content should not matter + // The contents of the O3D marker file. Arguably the content should not matter // but for the sake of completeness we define the content so there is no // ambiguity. - static const char* O3D_MARKER_CONTENT; + static const char* const kO3DMarkerContent; // The size of the O3D_MARKER_CONTENT. - static const size_t O3D_MARKER_CONTENT_LENGTH; + static const size_t kO3DMarkerContentLength; public: typedef SmartPointer<ArchiveRequest> Ref; |