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

Unified Diff: tools/grit/grit/node/include.py

Issue 7744017: Updated *.pak file format to support both UTF8 and UTF16 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Modified mac-specific parts of the code. Created 9 years, 3 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 | « tools/grit/grit/format/data_pack_unittest.py ('k') | tools/grit/grit/node/message.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/grit/grit/node/include.py
diff --git a/tools/grit/grit/node/include.py b/tools/grit/grit/node/include.py
index b073bc725cb0f9b30460fe55a5739a273c1445b9..dc29315e5a809307e835ecba4d948b9833109648 100644
--- a/tools/grit/grit/node/include.py
+++ b/tools/grit/grit/node/include.py
@@ -74,7 +74,7 @@ class IncludeNode(base.Node):
'''
return self.FilenameToOpen()
- def GetDataPackPair(self, lang):
+ def GetDataPackPair(self, lang, encoding):
'''Returns a (id, string) pair that represents the resource id and raw
bytes of the data. This is used to generate the data pack data file.
'''
@@ -90,6 +90,8 @@ class IncludeNode(base.Node):
data = infile.read()
infile.close()
+ # Include does not care about the encoding, because it only returns binary
+ # data.
return id, data
def Flatten(self, output_dir):
@@ -136,4 +138,3 @@ class IncludeNode(base.Node):
node.EndParsing()
return node
Construct = staticmethod(Construct)
-
« no previous file with comments | « tools/grit/grit/format/data_pack_unittest.py ('k') | tools/grit/grit/node/message.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698