| OLD | NEW |
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "app/gfx/canvas.h" | |
| 6 #include "app/l10n_util.h" | 5 #include "app/l10n_util.h" |
| 7 #include "base/i18n/rtl.h" | 6 #include "base/i18n/rtl.h" |
| 8 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "gfx/canvas.h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 10 #include "views/border.h" | 10 #include "views/border.h" |
| 11 #include "views/controls/label.h" | 11 #include "views/controls/label.h" |
| 12 | 12 |
| 13 namespace views { | 13 namespace views { |
| 14 | 14 |
| 15 // All text sizing measurements (width and height) should be greater than this. | 15 // All text sizing measurements (width and height) should be greater than this. |
| 16 const int kMinTextDimension = 4; | 16 const int kMinTextDimension = 4; |
| 17 | 17 |
| 18 #if defined(WIN_OS) | 18 #if defined(WIN_OS) |
| (...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 492 #else | 492 #else |
| 493 EXPECT_EQ( | 493 EXPECT_EQ( |
| 494 gfx::Canvas::MULTI_LINE | | 494 gfx::Canvas::MULTI_LINE | |
| 495 gfx::Canvas::TEXT_ALIGN_CENTER | | 495 gfx::Canvas::TEXT_ALIGN_CENTER | |
| 496 gfx::Canvas::NO_ELLIPSIS, | 496 gfx::Canvas::NO_ELLIPSIS, |
| 497 flags); | 497 flags); |
| 498 #endif | 498 #endif |
| 499 } | 499 } |
| 500 | 500 |
| 501 } // namespace views | 501 } // namespace views |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1132006:
Move app/gfx/canvas and app/gfx/font to gfx/. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/