| Index: app/data_pack.h
|
| ===================================================================
|
| --- app/data_pack.h (revision 69975)
|
| +++ app/data_pack.h (working copy)
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2008 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -6,8 +6,8 @@
|
| // (key, value) pairs of data. It's used to store static resources like
|
| // translation strings and images.
|
|
|
| -#ifndef BASE_DATA_PACK_H_
|
| -#define BASE_DATA_PACK_H_
|
| +#ifndef APP_DATA_PACK_H_
|
| +#define APP_DATA_PACK_H_
|
| #pragma once
|
|
|
| #include <map>
|
| @@ -15,15 +15,19 @@
|
| #include "base/basictypes.h"
|
| #include "base/scoped_ptr.h"
|
|
|
| +namespace base {
|
| +class StringPiece;
|
| +}
|
| +
|
| namespace file_util {
|
| - class MemoryMappedFile;
|
| +class MemoryMappedFile;
|
| }
|
| +
|
| class FilePath;
|
| class RefCountedStaticMemory;
|
|
|
| -namespace base {
|
|
|
| -class StringPiece;
|
| +namespace app {
|
|
|
| class DataPack {
|
| public:
|
| @@ -36,7 +40,7 @@
|
| // Get resource by id |resource_id|, filling in |data|.
|
| // The data is owned by the DataPack object and should not be modified.
|
| // Returns false if the resource id isn't found.
|
| - bool GetStringPiece(uint32 resource_id, StringPiece* data) const;
|
| + bool GetStringPiece(uint32 resource_id, base::StringPiece* data) const;
|
|
|
| // Like GetStringPiece(), but returns a reference to memory. This interface
|
| // is used for image data, while the StringPiece interface is usually used
|
| @@ -45,7 +49,7 @@
|
|
|
| // Writes a pack file containing |resources| to |path|.
|
| static bool WritePack(const FilePath& path,
|
| - const std::map<uint32, StringPiece>& resources);
|
| + const std::map<uint32, base::StringPiece>& resources);
|
|
|
| private:
|
| // The memory-mapped data.
|
| @@ -57,6 +61,6 @@
|
| DISALLOW_COPY_AND_ASSIGN(DataPack);
|
| };
|
|
|
| -} // namespace base
|
| +} // namespace app
|
|
|
| -#endif // BASE_DATA_PACK_H_
|
| +#endif // APP_DATA_PACK_H_
|
|
|