| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 | 8 |
| 9 #include "app/app_switches.h" | 9 #include "app/app_switches.h" |
| 10 #include "app/gfx/chrome_canvas.h" | 10 #include "app/gfx/canvas.h" |
| 11 #include "app/resource_bundle.h" | 11 #include "app/resource_bundle.h" |
| 12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
| 13 #include "base/file_util.h" | 13 #include "base/file_util.h" |
| 14 #include "base/path_service.h" | 14 #include "base/path_service.h" |
| 15 #include "base/scoped_ptr.h" | 15 #include "base/scoped_ptr.h" |
| 16 #include "base/string16.h" | 16 #include "base/string16.h" |
| 17 #include "base/string_piece.h" | 17 #include "base/string_piece.h" |
| 18 #include "base/string_util.h" | 18 #include "base/string_util.h" |
| 19 #include "base/sys_string_conversions.h" | 19 #include "base/sys_string_conversions.h" |
| 20 #include "chrome/common/chrome_paths.h" | 20 #include "chrome/common/chrome_paths.h" |
| (...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 604 #else // defined(OS_LINUX) | 604 #else // defined(OS_LINUX) |
| 605 std::wstring wide_path = base::SysNativeMBToWide(path.value()); | 605 std::wstring wide_path = base::SysNativeMBToWide(path.value()); |
| 606 rtl_safe_path->append(WideToUTF16(wide_path)); | 606 rtl_safe_path->append(WideToUTF16(wide_path)); |
| 607 #endif | 607 #endif |
| 608 // Inserting a PDF (Pop Directional Formatting) mark as the last character. | 608 // Inserting a PDF (Pop Directional Formatting) mark as the last character. |
| 609 rtl_safe_path->push_back(kPopDirectionalFormatting); | 609 rtl_safe_path->push_back(kPopDirectionalFormatting); |
| 610 } | 610 } |
| 611 | 611 |
| 612 int DefaultCanvasTextAlignment() { | 612 int DefaultCanvasTextAlignment() { |
| 613 if (GetTextDirection() == LEFT_TO_RIGHT) { | 613 if (GetTextDirection() == LEFT_TO_RIGHT) { |
| 614 return ChromeCanvas::TEXT_ALIGN_LEFT; | 614 return gfx::Canvas::TEXT_ALIGN_LEFT; |
| 615 } else { | 615 } else { |
| 616 return ChromeCanvas::TEXT_ALIGN_RIGHT; | 616 return gfx::Canvas::TEXT_ALIGN_RIGHT; |
| 617 } | 617 } |
| 618 } | 618 } |
| 619 | 619 |
| 620 | 620 |
| 621 // Compares the character data stored in two different strings by specified | 621 // Compares the character data stored in two different strings by specified |
| 622 // Collator instance. | 622 // Collator instance. |
| 623 UCollationResult CompareStringWithCollator(const Collator* collator, | 623 UCollationResult CompareStringWithCollator(const Collator* collator, |
| 624 const std::wstring& lhs, | 624 const std::wstring& lhs, |
| 625 const std::wstring& rhs) { | 625 const std::wstring& rhs) { |
| 626 DCHECK(collator); | 626 DCHECK(collator); |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 736 } | 736 } |
| 737 | 737 |
| 738 void BiDiLineIterator::GetLogicalRun(int start, | 738 void BiDiLineIterator::GetLogicalRun(int start, |
| 739 int* end, | 739 int* end, |
| 740 UBiDiLevel* level) { | 740 UBiDiLevel* level) { |
| 741 DCHECK(bidi_ != NULL); | 741 DCHECK(bidi_ != NULL); |
| 742 ubidi_getLogicalRun(bidi_, start, end, level); | 742 ubidi_getLogicalRun(bidi_, start, end, level); |
| 743 } | 743 } |
| 744 | 744 |
| 745 } | 745 } |
| OLD | NEW |