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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 | « views/controls/label.cc ('k') | views/controls/link.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 "base/i18n/rtl.h" 5 #include "base/i18n/rtl.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "gfx/canvas.h"
8 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
9 #include "ui/base/l10n/l10n_util.h" 8 #include "ui/base/l10n/l10n_util.h"
9 #include "ui/gfx/canvas.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(OS_WIN) 18 #if defined(OS_WIN)
19 // Courier is failing on linux because it's non scalable. 19 // Courier is failing on linux because it's non scalable.
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 gfx::Canvas::TEXT_ALIGN_LEFT | 807 gfx::Canvas::TEXT_ALIGN_LEFT |
808 gfx::Canvas::NO_ELLIPSIS, 808 gfx::Canvas::NO_ELLIPSIS,
809 flags); 809 flags);
810 #endif 810 #endif
811 811
812 // Reset Locale 812 // Reset Locale
813 base::i18n::SetICUDefaultLocale(locale); 813 base::i18n::SetICUDefaultLocale(locale);
814 } 814 }
815 815
816 } // namespace views 816 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/label.cc ('k') | views/controls/link.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698