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

Side by Side Diff: views/controls/label_unittest.cc

Issue 830002: win: string_util.h -> utf_string_conversions.h fix. (Closed)
Patch Set: Don't remove utf_string_conversions.h from string_util.h just yet Created 10 years, 9 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
« no previous file with comments | « views/controls/label.cc ('k') | views/controls/message_box_view.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) 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" 5 #include "app/gfx/canvas.h"
6 #include "app/l10n_util.h" 6 #include "app/l10n_util.h"
7 #include "base/string_util.h" 7 #include "base/utf_string_conversions.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "views/border.h" 9 #include "views/border.h"
10 #include "views/controls/label.h" 10 #include "views/controls/label.h"
11 11
12 namespace views { 12 namespace views {
13 13
14 // All text sizing measurements (width and height) should be greater than this. 14 // All text sizing measurements (width and height) should be greater than this.
15 const int kMinTextDimension = 4; 15 const int kMinTextDimension = 4;
16 16
17 #if defined(WIN_OS) 17 #if defined(WIN_OS)
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 #else 502 #else
503 EXPECT_EQ( 503 EXPECT_EQ(
504 gfx::Canvas::MULTI_LINE | 504 gfx::Canvas::MULTI_LINE |
505 gfx::Canvas::TEXT_ALIGN_CENTER | 505 gfx::Canvas::TEXT_ALIGN_CENTER |
506 gfx::Canvas::NO_ELLIPSIS, 506 gfx::Canvas::NO_ELLIPSIS,
507 flags); 507 flags);
508 #endif 508 #endif
509 } 509 }
510 510
511 } // namespace views 511 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/label.cc ('k') | views/controls/message_box_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698