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

Side by Side Diff: courgette/encoded_program.cc

Issue 16614002: Use a direct include of utf_string_conversions.h in chrome_frame/, chromeos/, cloud_print/, compone… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « courgette/courgette_tool.cc ('k') | device/bluetooth/bluetooth_device.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "courgette/encoded_program.h" 5 #include "courgette/encoded_program.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/environment.h" 12 #include "base/environment.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/string_util.h" 15 #include "base/string_util.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "courgette/courgette.h" 17 #include "courgette/courgette.h"
18 #include "courgette/streams.h" 18 #include "courgette/streams.h"
19 #include "courgette/types_elf.h" 19 #include "courgette/types_elf.h"
20 20
21 namespace courgette { 21 namespace courgette {
22 22
23 // Stream indexes. 23 // Stream indexes.
24 const int kStreamMisc = 0; 24 const int kStreamMisc = 0;
25 const int kStreamOps = 1; 25 const int kStreamOps = 1;
26 const int kStreamBytes = 2; 26 const int kStreamBytes = 2;
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 if (assembled) 641 if (assembled)
642 return C_OK; 642 return C_OK;
643 return C_ASSEMBLY_FAILED; 643 return C_ASSEMBLY_FAILED;
644 } 644 }
645 645
646 void DeleteEncodedProgram(EncodedProgram* encoded) { 646 void DeleteEncodedProgram(EncodedProgram* encoded) {
647 delete encoded; 647 delete encoded;
648 } 648 }
649 649
650 } // end namespace 650 } // end namespace
OLDNEW
« no previous file with comments | « courgette/courgette_tool.cc ('k') | device/bluetooth/bluetooth_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698